[ar7] revert part of r16112, the setup.c part needs more testing

[openwrt.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 64be864..3ced235 100644 (file)
--- a/package/mac80211/patches/007-remove_unused_stuff.patch
+++ b/package/mac80211/patches/007-remove_unused_stuff.patch
@@ -1,6 +1,6 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -104,10 +104,10 @@ CONFIG_MAC80211_MESH=y
+@@ -107,10 +107,10 @@ CONFIG_MAC80211_MESH=y
  CONFIG_CFG80211=m
  # CONFIG_CFG80211_REG_DEBUG=y
  
@@ -14,8 +14,8 @@
 +# CONFIG_LIB80211_CRYPT_TKIP=m
  # CONFIG_LIB80211_DEBUG=y
  
- CONFIG_NL80211=y
-@@ -128,54 +128,54 @@ CONFIG_ATH9K=m
+ CONFIG_WIRELESS_OLD_REGULATORY=n
+@@ -127,56 +127,56 @@ CONFIG_ATH9K=m
  # CONFIG_ATH9K_DEBUG=y
  
  
@@ -41,12 +41,14 @@
  
  
 -CONFIG_B43=m
+-CONFIG_B43_HWRNG=y
 -CONFIG_B43_PCI_AUTOSELECT=y
 -CONFIG_B43_PCICORE_AUTOSELECT=y
 -CONFIG_B43_PCMCIA=y
 -CONFIG_B43_PIO=y
 -CONFIG_B43_LEDS=y
 +# CONFIG_B43=m
++# CONFIG_B43_HWRNG=y
 +# CONFIG_B43_PCI_AUTOSELECT=y
 +# CONFIG_B43_PCICORE_AUTOSELECT=y
 +# CONFIG_B43_PCMCIA=y
@@ -57,10 +59,12 @@
  # CONFIG_B43_FORCE_PIO=y
  
 -CONFIG_B43LEGACY=m
+-CONFIG_B43LEGACY_HWRNG=y
 -CONFIG_B43LEGACY_PCI_AUTOSELECT=y
 -CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
 -CONFIG_B43LEGACY_LEDS=y
 +# CONFIG_B43LEGACY=m
++# CONFIG_B43LEGACY_HWRNG=y
 +# CONFIG_B43LEGACY_PCI_AUTOSELECT=y
 +# CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
 +# CONFIG_B43LEGACY_LEDS=y
@@ -99,7 +103,7 @@
  # CONFIG_IPW2200_DEBUG=y
  # The above enables use a second interface prefixed 'rtap'.
  #           Example usage:
-@@ -190,27 +190,27 @@ CONFIG_IPW2200_QOS=y
+@@ -191,27 +191,27 @@ CONFIG_IPW2200_QOS=y
  #
  # % echo 1 > /sys/bus/pci/drivers/ipw2200/*/rtap_iface
  
@@ -132,8 +136,7 @@
 +# CONFIG_B44_PCICORE_AUTOSELECT=y
 +# CONFIG_B44_PCI=y
  
--CONFIG_RTL8180=m
-+# CONFIG_RTL8180=m
+ CONFIG_RTL8180=m
  
 -CONFIG_ADM8211=m
 -CONFIG_PCMCIA_ATMEL=m
@@ -142,7 +145,7 @@
  
  CONFIG_RT2X00_LIB_PCI=m
  CONFIG_RT2400PCI=m
-@@ -226,16 +226,16 @@ CONFIG_RT61PCI=m
+@@ -227,24 +227,24 @@ CONFIG_RT61PCI=m
  NEED_RT2X00_FIRMWARE=y
  endif
  
@@ -157,13 +160,23 @@
  endif
  ## end of PCI
  
+ ifneq ($(CONFIG_PCMCIA),)
+ 
+-CONFIG_LIBERTAS_CS=m
+-NEED_LIBERTAS=y
++# CONFIG_LIBERTAS_CS=m
++# NEED_LIBERTAS=y
+ 
+ endif
+ ## end of PCMCIA
+ 
  # This is required for some cards
 -CONFIG_EEPROM_93CX6=m
 +# CONFIG_EEPROM_93CX6=m
  
  # USB Drivers
  ifneq ($(CONFIG_USB),)
-@@ -249,22 +249,22 @@ CONFIG_ZD1211RW=m
+@@ -258,21 +258,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
@@ -176,25 +189,55 @@
  
  
  CONFIG_P54_USB=m
--CONFIG_RTL8187=m
-+# CONFIG_RTL8187=m
+ CONFIG_RTL8187=m
  
 -CONFIG_AT76C50X_USB=m
 +# CONFIG_AT76C50X_USB=m
  
- # Activate AR9170 support only on kernel >= 2.6.28.
+ # Activate AR9170 support only on kernel >= 2.6.29.
  # The needed USB poison feature was added in this kernel release.
- ifeq ($(shell test $(KERNEL_SUBLEVEL) -ge 28 && echo yes),yes)
--CONFIG_AR9170_COMMON=m
+ ifeq ($(shell test $(KERNEL_SUBLEVEL) -ge 29 && echo yes),yes)
 -CONFIG_AR9170_USB=m
 -CONFIG_AR9170_LEDS=y
-+# CONFIG_AR9170_COMMON=m
 +# CONFIG_AR9170_USB=m
 +# CONFIG_AR9170_LEDS=y
  endif
  
  # RT2500USB does not require firmware
-@@ -302,20 +302,20 @@ CONFIG_P54_COMMON=m
+@@ -286,24 +286,24 @@ CONFIG_RT73USB=m
+ NEED_RT2X00_FIRMWARE=y
+ endif
+ 
+-CONFIG_LIBERTAS_THINFIRM_USB=m
+-CONFIG_LIBERTAS_USB=m
+-NEED_LIBERTAS=y
++# CONFIG_LIBERTAS_THINFIRM_USB=m
++# CONFIG_LIBERTAS_USB=m
++# NEED_LIBERTAS=y
+ 
+ endif # end of USB driver list
+ 
+ ifneq ($(CONFIG_SPI_MASTER),)
+ 
+-CONFIG_WL12XX=m
+-CONFIG_LIBERTAS_SPI=m
+-NEED_LIBERTAS=y
++# CONFIG_WL12XX=m
++# CONFIG_LIBERTAS_SPI=m
++# NEED_LIBERTAS=y
+ 
+ endif # end of SPI driver list
+ 
+ ifneq ($(CONFIG_MMC),)
+ 
+-CONFIG_LIBERTAS_SDIO=m
+-NEED_LIBERTAS=y
++# CONFIG_LIBERTAS_SDIO=m
++# NEED_LIBERTAS=y
+ 
+ endif # end of SDIO driver list
+ 
+@@ -333,13 +333,13 @@ CONFIG_ATH_COMMON=m
  
  
  # Sonics Silicon Backplane
@@ -206,19 +249,9 @@
 +# CONFIG_SSB_SPROM=y
  # CONFIG_SSB_DEBUG=y
  
- ifneq ($(CONFIG_USB),)
- ifneq ($(CONFIG_LIBERTAS_THINFIRM_USB),m)
--CONFIG_LIBERTAS_USB=m
--NEED_LIBERTAS=y
-+# CONFIG_LIBERTAS_USB=m
-+# NEED_LIBERTAS=y
- endif
- endif
- ifneq ($(CONFIG_PCMCIA),)
--CONFIG_LIBERTAS_CS=m
--NEED_LIBERTAS=y
-+# CONFIG_LIBERTAS_CS=m
-+# NEED_LIBERTAS=y
- endif
  ifeq ($(NEED_LIBERTAS),y)
+-CONFIG_LIBERTAS_THINFIRM=m
++# CONFIG_LIBERTAS_THINFIRM=m
  CONFIG_LIBERTAS=m
+ # CONFIG_LIBERTAS_DEBUG=y
+ endif