rpms/kernel/devel kernel-2.6.spec,1.3143,1.3144

[John W. Linville (linville)]

Author: linville

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

Modified Files:
	kernel-2.6.spec 
Log Message:
avoid some PCI ID conflicts w/ bcm43xx and zd1211rw


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3143
retrieving revision 1.3144
diff -u -r1.3143 -r1.3144
--- kernel-2.6.spec	8 May 2007 15:28:38 -0000	1.3143
+++ kernel-2.6.spec	8 May 2007 18:49:43 -0000	1.3144
@@ -584,6 +584,7 @@
 Patch2300: linux-2.6-wireless.patch
 Patch2301: git-wireless-dev.patch
 Patch2302: git-iwlwifi.patch
+Patch2303: linux-2.6-bcm43xx-pci-neuter.patch
 
 # Assorted dyntick/clock/timer fixes.
 Patch2400: linux-2.6-highres-dyntick-avoid-xtime-lock-contention.patch
@@ -1322,6 +1323,8 @@
 %patch2301 -p1
 # ...and the iwlwifi driver from Intel
 %patch2302 -p1
+# ...and avoid bcm43xx vs bcm43xx-mac80211 PCI ID conflicts
+%patch2303 -p1
 
 # Assorted dyntick/clock/timer fixes.
 %patch2400 -p1
@@ -2304,6 +2307,10 @@
 %endif
 
 %changelog
+* Tue May 08 2007 John W. Linville <linville at redhat.com>
+- Avoid PCI ID conflicts between bcm43xx and bcm43xx-mac80211
+- Disable zd1211rw in favor of zd1211rw-mac80211
+
 * Tue May 08 2007 Dave Jones <davej at redhat.com>
 - Some tweaks to the recent timer fixes.