rpms/kernel/devel kernel.spec, 1.592, 1.593 linux-2.6-compile-fixes.patch, 1.160, 1.161 linux-2.6-libata-ali-atapi-dma.patch, 1.1, NONE

[Chuck Ebbert (cebbert)]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16132

Modified Files:
	kernel.spec linux-2.6-compile-fixes.patch 
Removed Files:
	linux-2.6-libata-ali-atapi-dma.patch 
Log Message:
* Tue Apr 08 2008 Chuck Ebbert <cebbert at redhat.com>
- Remove pata_ali ATAPI DMA disable patch, now upstream.
- Fix build of pvrusb2 driver.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.592
retrieving revision 1.593
diff -u -r1.592 -r1.593
--- kernel.spec	8 Apr 2008 03:38:38 -0000	1.592
+++ kernel.spec	8 Apr 2008 04:21:12 -0000	1.593
@@ -605,7 +605,6 @@
 Patch570: linux-2.6-selinux-mprotect-checks.patch
 Patch580: linux-2.6-sparc-selinux-mprotect-checks.patch
 Patch610: linux-2.6-defaults-fat-utf8.patch
-Patch660: linux-2.6-libata-ali-atapi-dma.patch
 Patch670: linux-2.6-ata-quirk.patch
 
 Patch680: linux-2.6-wireless.patch
@@ -1112,8 +1111,6 @@
 # Use UTF-8 by default on VFAT.
 ApplyPatch linux-2.6-defaults-fat-utf8.patch
 
-# Disable ATAPI DMA on ALI chipsets.
-ApplyPatch linux-2.6-libata-ali-atapi-dma.patch
 # ia64 ata quirk
 ApplyPatch linux-2.6-ata-quirk.patch
 
@@ -1761,6 +1758,10 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Tue Apr 08 2008 Chuck Ebbert <cebbert at redhat.com>
+- Remove pata_ali ATAPI DMA disable patch, now upstream.
+- Fix build of pvrusb2 driver.
+
 * Mon Apr 07 2008 John W. Linville <linville at redhat.com>
 - iwlwifi: fix n-band association problem
 - ipw2200: set MAC address on radiotap interface

linux-2.6-compile-fixes.patch:

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- linux-2.6-compile-fixes.patch	14 Dec 2007 03:14:09 -0000	1.160
+++ linux-2.6-compile-fixes.patch	8 Apr 2008 04:21:12 -0000	1.161
@@ -5,3 +5,30 @@
 # to do a compile to figure out what your diff is fixing. Thanks.
 #
 
+drivers/media/video/pvrusb2/pvrusb2-devattr.c:178: error: unknown field 'flag_has_analogtuner' specified in initializer
+drivers/media/video/pvrusb2/pvrusb2-devattr.c:179: error: unknown field 'flag_has_composite' specified in initializer
+drivers/media/video/pvrusb2/pvrusb2-devattr.c:180: error: unknown field 'flag_has_svideo' specified in initializer
+drivers/media/video/pvrusb2/pvrusb2-devattr.c:182: error: unknown field 'digital_control_scheme' specified in initializer
+drivers/media/video/pvrusb2/pvrusb2-devattr.c:182: error: 'PVR2_DIGITAL_SCHEME_HAUPPAUGE' undeclared here (not in a function)
+drivers/media/video/pvrusb2/pvrusb2-devattr.c:183: error: unknown field 'led_scheme' specified in initializer
+drivers/media/video/pvrusb2/pvrusb2-devattr.c:183: error: 'PVR2_LED_SCHEME_HAUPPAUGE' undeclared here (not in a function)
+
+--- a/drivers/media/video/pvrusb2/pvrusb2-devattr.c
++++ b/drivers/media/video/pvrusb2/pvrusb2-devattr.c
+@@ -175,12 +175,16 @@ static const struct pvr2_device_desc pvr2_device_73xxx = {
+ 		.fx2_firmware.cnt = ARRAY_SIZE(pvr2_fw1_names_73xxx),
+ 		.flag_has_cx25840 = !0,
+ 		.flag_has_hauppauge_rom = !0,
++#if 0
+ 		.flag_has_analogtuner = !0,
+ 		.flag_has_composite = !0,
+ 		.flag_has_svideo = !0,
+ 		.signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE,
+ 		.digital_control_scheme = PVR2_DIGITAL_SCHEME_HAUPPAUGE,
+ 		.led_scheme = PVR2_LED_SCHEME_HAUPPAUGE,
++#else
++		.signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE,
++#endif
+ };
+ 
+ 


--- linux-2.6-libata-ali-atapi-dma.patch DELETED ---