[mac80211] Update compat-wireless to 2009-06-25

[openwrt/svn-archive/archive.git] / package / mac80211 / patches / 007-remove_unused_stuff.patch

diff --git a/package/mac80211/patches/007-remove_unused_stuff.patch b/package/mac80211/patches/007-remove_unused_stuff.patch
index 3ced2352f4ff2c625aa5c0815bcddeb8ac089d6f..efb73b2d37e5b1b15e8a316028d42e0aff32b740 100644 (file)
--- a/package/mac80211/patches/007-remove_unused_stuff.patch
+++ b/package/mac80211/patches/007-remove_unused_stuff.patch
@@ -15,16 +15,23 @@
  # CONFIG_LIB80211_DEBUG=y
  
  CONFIG_WIRELESS_OLD_REGULATORY=n
-@@ -127,56 +127,56 @@ CONFIG_ATH9K=m
+@@ -123,61 +123,61 @@ ifneq ($(CONFIG_PCI),)
+ 
+ CONFIG_ATH5K=m
+ # CONFIG_ATH5K_DEBUG=y
+-CONFIG_ATH5K_RFKILL=y
++# CONFIG_ATH5K_RFKILL=y
+ CONFIG_ATH9K=m
  # CONFIG_ATH9K_DEBUG=y
  
  
 -CONFIG_IWLWIFI=m
 -CONFIG_IWLWIFI_LEDS=y
+-CONFIG_IWLWIFI_RFKILL=y
+-CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT=y
 +# CONFIG_IWLWIFI=m
 +# CONFIG_IWLWIFI_LEDS=y
- # CONFIG_IWLWIFI_RFKILL=y
--CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT=y
++# CONFIG_IWLWIFI_RFKILL=y
 +# CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT=y
  # CONFIG_IWLWIFI_DEBUG=y
  # CONFIG_IWLWIFI_DEBUGFS=y
@@ -47,6 +54,7 @@
 -CONFIG_B43_PCMCIA=y
 -CONFIG_B43_PIO=y
 -CONFIG_B43_LEDS=y
+-CONFIG_B43_RFKILL=y
 +# CONFIG_B43=m
 +# CONFIG_B43_HWRNG=y
 +# CONFIG_B43_PCI_AUTOSELECT=y
@@ -54,7 +62,7 @@
 +# CONFIG_B43_PCMCIA=y
 +# CONFIG_B43_PIO=y
 +# CONFIG_B43_LEDS=y
- # CONFIG_B43_RFKILL=y
++# CONFIG_B43_RFKILL=y
  # CONFIG_B43_DEBUG=y
  # CONFIG_B43_FORCE_PIO=y
  
@@ -63,12 +71,13 @@
 -CONFIG_B43LEGACY_PCI_AUTOSELECT=y
 -CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
 -CONFIG_B43LEGACY_LEDS=y
+-CONFIG_B43LEGACY_RFKILL=y
 +# CONFIG_B43LEGACY=m
 +# CONFIG_B43LEGACY_HWRNG=y
 +# CONFIG_B43LEGACY_PCI_AUTOSELECT=y
 +# CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
 +# CONFIG_B43LEGACY_LEDS=y
- # CONFIG_B43LEGACY_RFKILL=y
++# CONFIG_B43LEGACY_RFKILL=y
  # CONFIG_B43LEGACY_DEBUG=y
  CONFIG_B43LEGACY_DMA=y
 -CONFIG_B43LEGACY_PIO=y
@@ -103,7 +112,7 @@
  # CONFIG_IPW2200_DEBUG=y
  # The above enables use a second interface prefixed 'rtap'.
  #           Example usage:
-@@ -191,27 +191,27 @@ CONFIG_IPW2200_QOS=y
+@@ -192,27 +192,27 @@ CONFIG_IPW2200_QOS=y
  #
  # % echo 1 > /sys/bus/pci/drivers/ipw2200/*/rtap_iface
  
@@ -145,7 +154,7 @@
  
  CONFIG_RT2X00_LIB_PCI=m
  CONFIG_RT2400PCI=m
-@@ -227,24 +227,24 @@ CONFIG_RT61PCI=m
+@@ -228,24 +228,24 @@ CONFIG_RT61PCI=m
  NEED_RT2X00_FIRMWARE=y
  endif
  
@@ -176,7 +185,7 @@
  
  # USB Drivers
  ifneq ($(CONFIG_USB),)
-@@ -258,21 +258,21 @@ CONFIG_ZD1211RW=m
+@@ -259,21 +259,21 @@ CONFIG_ZD1211RW=m
  # is only wireless RNDIS chip known to date.
  # Note: this depends on CONFIG_USB_NET_RNDIS_HOST and CONFIG_USB_NET_CDCETHER
  # it also requires new RNDIS_HOST and CDC_ETHER modules which we add
@@ -204,7 +213,7 @@
  endif
  
  # RT2500USB does not require firmware
-@@ -286,24 +286,24 @@ CONFIG_RT73USB=m
+@@ -287,30 +287,30 @@ CONFIG_RT73USB=m
  NEED_RT2X00_FIRMWARE=y
  endif
  
@@ -219,10 +228,12 @@
  
  ifneq ($(CONFIG_SPI_MASTER),)
  
--CONFIG_WL12XX=m
+-CONFIG_WL1251=m
+-CONFIG_P54_SPI=m
 -CONFIG_LIBERTAS_SPI=m
 -NEED_LIBERTAS=y
-+# CONFIG_WL12XX=m
++# CONFIG_WL1251=m
++# CONFIG_P54_SPI=m
 +# CONFIG_LIBERTAS_SPI=m
 +# NEED_LIBERTAS=y
  
@@ -235,10 +246,29 @@
 +# CONFIG_LIBERTAS_SDIO=m
 +# NEED_LIBERTAS=y
  
- endif # end of SDIO driver list
- 
-@@ -333,13 +333,13 @@ CONFIG_ATH_COMMON=m
+ # Activate iwmc3200wifi support only on kernel >= 2.6.29.
+ # iwmc3200wifi uses new netdev_ops api no supported by old kernel.
+ ifeq ($(shell test $(KERNEL_SUBLEVEL) -ge 29 && echo yes),yes)
+-CONFIG_IWM=m
++# CONFIG_IWM=m
+ # CONFIG_IWM_DEBUG=y
+ endif
  
+@@ -323,7 +323,7 @@ CONFIG_RT2X00_LIB=m
+ CONFIG_RT2X00_LIB_HT=y
+ CONFIG_RT2X00_LIB_FIRMWARE=y
+ CONFIG_RT2X00_LIB_CRYPTO=y
+-CONFIG_RT2X00_LIB_RFKILL=y
++# CONFIG_RT2X00_LIB_RFKILL=y
+ CONFIG_RT2X00_LIB_LEDS=y
+ # CONFIG_RT2X00_LIB_DEBUGFS=y
+ # CONFIG_RT2X00_DEBUG=y
+@@ -340,25 +340,25 @@ CONFIG_P54_LEDS=y
+ # Atheros
+ CONFIG_ATH_COMMON=m
+ 
+-CONFIG_WL12XX=y
++# CONFIG_WL12XX=y
  
  # Sonics Silicon Backplane
 -CONFIG_SSB_POSSIBLE=y
@@ -251,7 +281,20 @@
  
  ifeq ($(NEED_LIBERTAS),y)
 -CONFIG_LIBERTAS_THINFIRM=m
+-CONFIG_LIBERTAS=m
 +# CONFIG_LIBERTAS_THINFIRM=m
- CONFIG_LIBERTAS=m
++# CONFIG_LIBERTAS=m
  # CONFIG_LIBERTAS_DEBUG=y
  endif
+ 
+ # We need the backported rfkill module on kernel < 2.6.31.
+ # In more recent kernel versions use the in kernel rfkill module.
+ ifeq ($(shell test $(KERNEL_SUBLEVEL) -le 30 && echo yes),yes)
+-CONFIG_RFKILL_BACKPORT=m
+-CONFIG_RFKILL_BACKPORT_LEDS=y
+-CONFIG_RFKILL_BACKPORT_INPUT=y
++# CONFIG_RFKILL_BACKPORT=m
++# CONFIG_RFKILL_BACKPORT_LEDS=y
++# CONFIG_RFKILL_BACKPORT_INPUT=y
+ endif
+