rpms/kernel/devel/configs config-generic,1.293,1.293.2.1

[fedora-cvs-commits at redhat.com]

Author: linville

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

Modified Files:
      Tag: private-linville-jwltest-fc7-2-branch
	config-generic 
Log Message:



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.293
retrieving revision 1.293.2.1
diff -u -r1.293 -r1.293.2.1
--- config-generic	27 Feb 2007 01:26:45 -0000	1.293
+++ config-generic	27 Feb 2007 22:11:32 -0000	1.293.2.1
@@ -1082,7 +1082,6 @@
 CONFIG_ADAPTEC_STARFIRE=m
 CONFIG_ADAPTEC_STARFIRE_NAPI=y
 CONFIG_B44=m
-CONFIG_B44_PCI=y
 CONFIG_BNX2=m
 CONFIG_QLA3XXX=m
 CONFIG_ATL1=m
@@ -1193,9 +1192,9 @@
 #
 # Wireless 802.11b ISA/PCI cards support
 #
-CONFIG_D80211=m
-CONFIG_D80211_LEDS=y
-# CONFIG_D80211_DEBUG is not set
+CONFIG_MAC80211=m
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUG is not set
 CONFIG_IEEE80211=m
 CONFIG_IEEE80211_DEBUG=y
 CONFIG_IEEE80211_CRYPT_WEP=m
@@ -1205,6 +1204,7 @@
 CONFIG_IEEE80211_SOFTMAC_DEBUG=y
 CONFIG_CFG80211=m
 CONFIG_CFG80211_WEXT_COMPAT=y
+# CONFIG_NL80211 is not set
 # CONFIG_IPW2100 is not set
 # CONFIG_IPW2200 is not set
 # CONFIG_IPW2100_DEBUG is not set
@@ -1212,15 +1212,15 @@
 CONFIG_USB_ZD1201=m
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
-CONFIG_BCM43XX_D80211=m
-CONFIG_BCM43XX_D80211_PCI=y
-CONFIG_BCM43XX_D80211_PCMCIA=y
-CONFIG_BCM43XX_D80211_DEBUG=y
-CONFIG_BCM43XX_D80211_DMA=y
-CONFIG_BCM43XX_D80211_PIO=y
-CONFIG_BCM43XX_D80211_DMA_AND_PIO_MODE=y
-# CONFIG_BCM43XX_D80211_DMA_MODE is not set
-# CONFIG_BCM43XX_D80211_PIO_MODE is not set
+CONFIG_BCM43XX_MAC80211=m
+CONFIG_BCM43XX_MAC80211_PCI=y
+CONFIG_BCM43XX_MAC80211_PCMCIA=y
+CONFIG_BCM43XX_MAC80211_DEBUG=y
+CONFIG_BCM43XX_MAC80211_DMA=y
+CONFIG_BCM43XX_MAC80211_PIO=y
+CONFIG_BCM43XX_MAC80211_DMA_AND_PIO_MODE=y
+# CONFIG_BCM43XX_MAC80211_DMA_MODE is not set
+# CONFIG_BCM43XX_MAC80211_PIO_MODE is not set
 CONFIG_RT2X00=y
 CONFIG_RT2400PCI=m
 # CONFIG_RT2400PCI_DEBUG is not set
@@ -1236,8 +1236,10 @@
 CONFIG_P54_COMMON=m
 CONFIG_P54_USB=m
 CONFIG_P54_PCI=m
-CONFIG_ZD1211RW_D80211=m
-# CONFIG_ZD1211RW_D80211_DEBUG is not set
+CONFIG_ZD1211RW_MAC80211=m
+# CONFIG_ZD1211RW_MAC80211_DEBUG is not set
+CONFIG_RTL818X=y
+CONFIG_RTL8187=m
 CONFIG_AIRO=m
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m