rpms/kernel/devel linux-2.6-bcm43xx-neuter.patch, NONE, 1.1 kernel-2.6.spec, 1.2030, 1.2031

[fedora-cvs-commits at redhat.com]

Author: linville

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7784

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-bcm43xx-neuter.patch 
Log Message:


linux-2.6-bcm43xx-neuter.patch:
 bcm43xx_main.c |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE linux-2.6-bcm43xx-neuter.patch ---
--- linux-2.6.15.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.c.orig	2006-03-07 17:11:21.000000000 -0500
+++ linux-2.6.15.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.c	2006-03-07 17:11:46.000000000 -0500
@@ -143,7 +143,9 @@ MODULE_PARM_DESC(fwpostfix, "Postfix for
 #endif
 	{ 0 },
 };
+#if 0 /* Disable automatic loading in FC5 */
 MODULE_DEVICE_TABLE(pci, bcm43xx_pci_tbl);
+#endif
 
 static void bcm43xx_ram_write(struct bcm43xx_private *bcm, u16 offset, u32 val)
 {


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2030
retrieving revision 1.2031
diff -u -r1.2030 -r1.2031
--- kernel-2.6.spec	7 Mar 2006 19:37:17 -0000	1.2030
+++ kernel-2.6.spec	7 Mar 2006 22:20:56 -0000	1.2031
@@ -409,6 +409,7 @@
 # Broadcom wireless driver
 Patch5000: linux-2.6-softmac-git.patch
 Patch5001: linux-2.6-bcm43xx-git.patch
+Patch5002: linux-2.6-bcm43xx-neuter.patch
 
 #
 # 10000 to 20000 is for stuff that has to come last due to the
@@ -1049,6 +1050,8 @@
 %patch5000 -p1
 # ... and bcm43xx driver too
 %patch5001 -p1
+# temporarily remove bcm43xx's MODULE_DEVICE_TABLE entry
+%patch5002 -p1
 
 #
 # final stuff
@@ -1653,6 +1656,9 @@
 %endif
 
 %changelog
+* Tue Mar  7 2006 John W. Linville <linville at redhat.com>
+- Temporarily disable automatic load of bcm43xx driver (causes hangs on some systems)
+
 * Tue Mar  7 2006 Stephen Tweedie <sct at redhat.com>
 - Include xen header files in -devel packages if we're building xen.
   (bug 180198)