add some new configuration vaules to the config.mk file

Update compat/compat.diff

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>

diff --git a/compat/compat.diff b/compat/compat.diff
index 721983c771d2623a6cf0bb971fd6f3e32ffddcd6..c2932301fa3b5733406ec74710412a0d0060c9d9 100644 (file)
--- a/compat/compat.diff
+++ b/compat/compat.diff
@@ -111,7 +111,7 @@ index 842a08d..079c1fd 100644
                goto out1;
 --- a/net/mac80211/main.c      2008-12-09 05:36:29.000000000 -0800
 +++ b/net/mac80211/main.c      2008-12-09 05:36:34.000000000 -0800
-@@ -448,6 +448,7 @@
+@@ -449,6 +449,7 @@
                return;
        }
  
@@ -119,7 +119,7 @@ index 842a08d..079c1fd 100644
        if (!test_sta_flags(sta, WLAN_STA_PS) && !skb->requeue) {
                /* Software retry the packet once */
                skb->requeue = 1;
-@@ -455,6 +456,7 @@
+@@ -456,6 +457,7 @@
                dev_queue_xmit(skb);
                return;
        }

diff --git a/config.mk b/config.mk
index d94a97691247fb660d6f25e8bb1a463f0a972319..8785dda494e2d1a4a8de6cb490f263742f5021a3 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -59,6 +59,7 @@ endif
 endif # build check
 endif # kernel Makefile check
 
+
 # choose between pid and minstrel as default rate control algorithm
 CONFIG_MAC80211_RC_DEFAULT=minstrel
 CONFIG_MAC80211_RC_PID=y
@@ -69,12 +70,15 @@ CONFIG_MAC80211_LEDS=y
 CONFIG_MAC80211_MESH=y
 
 CONFIG_CFG80211=m
+# CONFIG_CFG80211_REG_DEBUG is not set
+
 CONFIG_LIB80211=m
 CONFIG_LIB80211_CRYPT_WEP=m
 CONFIG_LIB80211_CRYPT_CCMP=m
 CONFIG_LIB80211_CRYPT_TKIP=m
 
 CONFIG_NL80211=y
+
 # We'll disable this as soon major distributions
 # start shipping this
 CONFIG_WIRELESS_OLD_REGULATORY=y
@@ -86,46 +90,62 @@ CONFIG_MAC80211_HWSIM=m
 ifneq ($(CONFIG_PCI),)
 
 CONFIG_ATH5K=m
-CONFIG_ATH5K_DEBUG=n
-CONFIG_ATH9K=m
+# CONFIG_ATH5K_DEBUG is not set
 CONFIG_ATH9K=m
+# CONFIG_ATH9K_DEBUG is not set
 
-# Required for older kernels which still use this flag.
-CONFIG_IWLWIFI=m
 
+CONFIG_IWLWIFI=m
 CONFIG_IWLCORE=m
+CONFIG_IWLWIFI_LEDS=y
+# CONFIG_IWLWIFI_RFKILL=y
+# CONFIG_IWLWIFI_DEBUG is not set
+CONFIG_IWLAGN=m
+CONFIG_IWLAGN_SPECTRUM_MEASUREMENT=y
+CONFIG_IWLAGN_LEDS=y
+CONFIG_IWL4965=y
+CONFIG_IWL5000=y
 CONFIG_IWL3945=m
-CONFIG_IWL4965=m
-CONFIG_IWL4965_HT=y
+# CONFIG_IWL3945_RFKILL=y
+CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y
+CONFIG_IWL3945_LEDS=y
+# CONFIG_IWL3945_DEBUG is not set
+
+
 CONFIG_B43=m
-# B43 uses PCMCIA only for Compact Flash. The Cardbus cards uses PCI
-# Example, bcm4318:
-# http://www.multicap.biz/wireless-lan/indoor-wlan-hardware/sdc-cf10g-80211g-compact-flash-module
-CONFIG_B43_PCMCIA=y
-CONFIG_B43_PIO=y
-# B43_PIO selects SSB_BLOCKIO
-CONFIG_SSB_BLOCKIO=y
 CONFIG_B43_PCI_AUTOSELECT=y
 CONFIG_B43_PCICORE_AUTOSELECT=y
-#CONFIG_B43_RFKILL=n
+CONFIG_B43_PCMCIA=y
+CONFIG_B43_PIO=y
 CONFIG_B43_LEDS=y
+# CONFIG_B43_RFKILL=y
 # CONFIG_B43_DEBUG is not set
 
 CONFIG_B43LEGACY=m
 CONFIG_B43LEGACY_PCI_AUTOSELECT=y
 CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
+CONFIG_B43LEGACY_LEDS=y
+# CONFIG_B43LEGACY_RFKILL=y
+# CONFIG_B43LEGACY_DEBUG=y
 CONFIG_B43LEGACY_DMA=y
 CONFIG_B43LEGACY_PIO=y
 CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
+# CONFIG_B43LEGACY_DMA_MODE is not set
+# CONFIG_B43LEGACY_PIO_MODE is not set
 
 # The Intel ipws
 CONFIG_LIBIPW=m
+# CONFIG_LIBIPW_DEBUG is not set
+
 CONFIG_IPW2100=m
 CONFIG_IPW2100_MONITOR=y
+# CONFIG_IPW2100_DEBUG is not set
 CONFIG_IPW2200=m
 CONFIG_IPW2200_MONITOR=y
 CONFIG_IPW2200_RADIOTAP=y
 CONFIG_IPW2200_PROMISCUOUS=y
+CONFIG_IPW2200_QOS=y
+# CONFIG_IPW2200_DEBUG is not set
 # The above enables use a second interface prefixed 'rtap'.
 #           Example usage:
 #
@@ -138,24 +158,32 @@ CONFIG_IPW2200_PROMISCUOUS=y
 # it on via sysfs:
 #
 # % echo 1 > /sys/bus/pci/drivers/ipw2200/*/rtap_iface
-CONFIG_IPW2200_QOS=y
-
-CONFIG_P54_PCI=m
 
+CONFIG_SSB_BLOCKIO=y
 CONFIG_SSB_PCIHOST_POSSIBLE=y
 CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_B43_PCI_BRIDGE=y
+CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
+CONFIG_SSB_PCMCIAHOST=y
 CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
 CONFIG_SSB_DRIVER_PCICORE=y
-CONFIG_SSB_B43_PCI_BRIDGE=y
+
+CONFIG_P54_PCI=m
 
 CONFIG_B44=m
+CONFIG_B44_PCI_AUTOSELECT=y
+CONFIG_B44_PCICORE_AUTOSELECT=y
+CONFIG_B44_PCI=y
 
 CONFIG_RTL8180=m
+
 CONFIG_ADM8211=m
+CONFIG_PCMCIA_ATMEL=m
 
 CONFIG_RT2X00_LIB_PCI=m
 CONFIG_RT2400PCI=m
 CONFIG_RT2500PCI=m
+CONFIG_RT2800PCI=m
 NEED_RT2X00=y
 
 # Two rt2x00 drivers require firmware: rt61pci and rt73usb. They depend on
@@ -166,6 +194,9 @@ CONFIG_RT61PCI=m
 NEED_RT2X00_FIRMWARE=y
 endif
 
+CONFIG_ATMEL=m
+CONFIG_PCI_ATMEL=m
+
 endif
 ## end of PCI
 
@@ -175,10 +206,7 @@ CONFIG_EEPROM_93CX6=m
 # USB Drivers
 ifneq ($(CONFIG_USB),)
 CONFIG_ZD1211RW=m
-
-# support for USB Wireless devices using Atmel at76c503,
-# at76c505 or at76c505a chips.
-CONFIG_USB_ATMEL=m
+# CONFIG_ZD1211RW_DEBUG is not set
 
 # Sorry, rndis_wlan uses cancel_work_sync which is new and can't be done in compat...
 
@@ -191,11 +219,14 @@ CONFIG_USB_NET_RNDIS_HOST=m
 CONFIG_USB_NET_RNDIS_WLAN=m
 CONFIG_USB_NET_CDCETHER=m
 
+
 CONFIG_P54_USB=m
 CONFIG_RTL8187=m
 
+
 # RT2500USB does not require firmware
 CONFIG_RT2500USB=m
+CONFIG_RT2800USB=m
 CONFIG_RT2X00_LIB_USB=m
 NEED_RT2X00=y
 # RT73USB requires firmware
@@ -210,7 +241,11 @@ endif # end of USB driver list
 ifeq ($(NEED_RT2X00),y)
 CONFIG_RT2X00=m
 CONFIG_RT2X00_LIB=m
-# CONFIG_RT2X00_LIB_DEBUGFS is not set
+CONFIG_RT2X00_LIB_HT=y
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_CRYPTO=y
+# CONFIG_RT2X00_LIB_RFKILL=y
+CONFIG_RT2X00_LIB_LEDS=y
 # CONFIG_RT2X00_DEBUG is not set
 endif
 
@@ -221,20 +256,12 @@ endif
 # p54
 CONFIG_P54_COMMON=m
 
+
 # Sonics Silicon Backplane
 CONFIG_SSB_POSSIBLE=y
 CONFIG_SSB=m
 CONFIG_SSB_SPROM=y
-
-ifneq ($(CONFIG_PCMCIA),)
-CONFIG_SSB_PCMCIAHOST=y
-endif
-
-# These two are for mips
-CONFIG_SSB_DRIVER_MIPS=n
-CONFIG_SSB_PCICORE_HOSTMODE=n
 # CONFIG_SSB_DEBUG is not set
-# CONFIG_SSB_DRIVER_EXTIF=y
 
 ifneq ($(CONFIG_USB),)
 ifneq ($(CONFIG_LIBERTAS_THINFIRM_USB),m)