rpms/kernel/devel/configs config-generic,1.310,1.311

[John W. Linville (linville)]

Author: linville

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

Modified Files:
	config-generic 
Log Message:
avoid some PCI ID conflicts w/ bcm43xx and zd1211rw


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.310
retrieving revision 1.311
diff -u -r1.310 -r1.311
--- config-generic	4 May 2007 15:10:13 -0000	1.310
+++ config-generic	8 May 2007 18:53:10 -0000	1.311
@@ -1198,8 +1198,7 @@
 # CONFIG_IPW2100_DEBUG is not set
 # CONFIG_IPW2200_DEBUG is not set
 CONFIG_USB_ZD1201=m
-CONFIG_ZD1211RW=m
-# CONFIG_ZD1211RW_DEBUG is not set
+# CONFIG_ZD1211RW is not set
 CONFIG_BCM43XX_MAC80211=m
 CONFIG_BCM43XX_MAC80211_PCI=y
 CONFIG_BCM43XX_MAC80211_PCMCIA=y