rpms/kernel/F-12 prism54-remove-pci-dev-table.patch, NONE, 1.1 kernel.spec, 1.1894, 1.1895

[John W. Linville]

Author: linville

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

Modified Files:
	kernel.spec 
Added Files:
	prism54-remove-pci-dev-table.patch 
Log Message:
prism54: remove pci modinfo device table (#447047)

prism54-remove-pci-dev-table.patch:
 islpci_hotplug.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE prism54-remove-pci-dev-table.patch ---
diff -up linux-2.6.31.noarch/drivers/net/wireless/prism54/islpci_hotplug.c.orig linux-2.6.31.noarch/drivers/net/wireless/prism54/islpci_hotplug.c
--- linux-2.6.31.noarch/drivers/net/wireless/prism54/islpci_hotplug.c.orig	2009-11-02 13:53:48.000000000 -0500
+++ linux-2.6.31.noarch/drivers/net/wireless/prism54/islpci_hotplug.c	2009-11-02 13:53:44.000000000 -0500
@@ -72,8 +72,10 @@ static const struct pci_device_id prism5
 	{0,0,0,0,0,0,0}
 };
 
+#if 0 /* Favor p54pci instead... */
 /* register the device with the Hotplug facilities of the kernel */
 MODULE_DEVICE_TABLE(pci, prism54_id_tbl);
+#endif
 
 static int prism54_probe(struct pci_dev *, const struct pci_device_id *);
 static void prism54_remove(struct pci_dev *);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1894
retrieving revision 1.1895
diff -u -p -r1.1894 -r1.1895
--- kernel.spec	2 Nov 2009 17:54:51 -0000	1.1894
+++ kernel.spec	2 Nov 2009 19:22:22 -0000	1.1895
@@ -662,6 +662,7 @@ Patch611: alsa-tell-user-that-stream-to-
 Patch670: linux-2.6-ata-quirk.patch
 Patch671: linux-2.6-ahci-export-capabilities.patch
 
+Patch680: prism54-remove-pci-dev-table.patch
 Patch687: linux-2.6-iwlwifi-reduce-noise-when-skb-allocation-fails.patch
 
 Patch800: linux-2.6-crash-driver.patch
@@ -1340,6 +1341,9 @@ ApplyPatch linux-2.6-ata-quirk.patch
 # Make it possible to identify non-hotplug SATA ports
 ApplyPatch linux-2.6-ahci-export-capabilities.patch
 
+# prism54: remove pci modinfo device table
+ApplyPatch prism54-remove-pci-dev-table.patch
+
 # iwlagn quiet
 ApplyPatch linux-2.6-iwlwifi-reduce-noise-when-skb-allocation-fails.patch
 
@@ -2104,6 +2108,9 @@ fi
 # and build.
 
 %changelog
+* Mon Nov 02 2009 John W. Linville <linville at redhat.com> 2.6.31.5-109
+- prism54: remove pci modinfo device table (#447047)
+
 * Mon Nov 02 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31.5-108
 - Enable acerhdf driver for fan speed control on Acer Aspire One notebook (#532463)