rpms/kernel/F-12 viafb-neuter-device-table.patch, NONE, 1.1 kernel.spec, 1.2020, 1.2021

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12318

Modified Files:
	kernel.spec 
Added Files:
	viafb-neuter-device-table.patch 
Log Message:
Drop the PCI device table in the viafb driver -- it was added in
  2.6.32 and we don't want the driver to autoload.

viafb-neuter-device-table.patch:
 viafbdev.c |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE viafb-neuter-device-table.patch ---
Index: linux-2.6.32.noarch/drivers/video/via/viafbdev.c
===================================================================
--- linux-2.6.32.noarch.orig/drivers/video/via/viafbdev.c
+++ linux-2.6.32.noarch/drivers/video/via/viafbdev.c
@@ -2161,6 +2161,8 @@ static int __init viafb_setup(char *opti
 #endif
 
 static struct pci_device_id viafb_pci_table[] __devinitdata = {
+/* We don't want this driver to autoload in F11/F-12 */
+/*
 	{ PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_CLE266_DID),
 	  .driver_data = UNICHROME_CLE266 },
 	{ PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_PM800_DID),
@@ -2183,6 +2185,7 @@ static struct pci_device_id viafb_pci_ta
 	  .driver_data = UNICHROME_VX800 },
 	{ PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_VX855_DID),
 	  .driver_data = UNICHROME_VX855 },
+*/
 	{ }
 };
 MODULE_DEVICE_TABLE(pci, viafb_pci_table);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.2020
retrieving revision 1.2021
diff -u -p -r1.2020 -r1.2021
--- kernel.spec	22 Feb 2010 07:36:05 -0000	1.2020
+++ kernel.spec	22 Feb 2010 11:40:40 -0000	1.2021
@@ -661,6 +661,7 @@ Patch470: die-floppy-die.patch
 Patch510: linux-2.6-silence-noise.patch
 Patch520: linux-2.6.30-hush-rom-warning.patch
 Patch530: linux-2.6-silence-fbcon-logo.patch
+Patch531: viafb-neuter-device-table.patch
 Patch570: linux-2.6-selinux-mprotect-checks.patch
 Patch580: linux-2.6-sparc-selinux-mprotect-checks.patch
 
@@ -1308,6 +1309,9 @@ ApplyPatch linux-2.6.30-hush-rom-warning
 # Make fbcon not show the penguins with 'quiet'
 ApplyPatch linux-2.6-silence-fbcon-logo.patch
 
+# don't autoload viafb
+ApplyPatch viafb-neuter-device-table.patch
+
 # Fix the SELinux mprotect checks on executable mappings
 #ApplyPatch linux-2.6-selinux-mprotect-checks.patch
 # Fix SELinux for sparc
@@ -2052,6 +2056,10 @@ fi
 # and build.
 
 %changelog
+* Mon Feb 22 2010 Chuck Ebbert <cebbert at redhat.com>  2.6.32.9-61.rc1
+- Drop the PCI device table in the viafb driver -- it was added in
+  2.6.32 and we don't want the driver to autoload.
+
 * Mon Feb 22 2010 Chuck Ebbert <cebbert at redhat.com>  2.6.32.9-60.rc1
 - Linux 2.6.32.9-rc1
 - Revert the 14 DRM patches from 2.6.32.9: we already have them