ath9k: revert one more linux upstream commit in the initvals to fully fix the ar938x...

[openwrt.git] / package / mac80211 / patches / 005-disable_ssb_build.patch

diff --git a/package/mac80211/patches/005-disable_ssb_build.patch b/package/mac80211/patches/005-disable_ssb_build.patch
index cdb4a34..8e89814 100644 (file)
--- a/package/mac80211/patches/005-disable_ssb_build.patch
+++ b/package/mac80211/patches/005-disable_ssb_build.patch
@@ -1,10 +1,47 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -22,7 +22,6 @@ NOSTDINC_FLAGS := -I$(M)/include/ -inclu
- obj-y := net/wireless/ net/mac80211/ net/rfkill/
- ifeq ($(ONLY_CORE),)
- obj-m += \
--      drivers/ssb/ \
-       drivers/misc/eeprom/ \
-       drivers/net/usb/ \
-       drivers/net/wireless/
+@@ -29,7 +29,6 @@ obj-$(CONFIG_COMPAT_WIRELESS_MODULES) +=
+ 
+ obj-$(CONFIG_COMPAT_NET_USB_MODULES) += drivers/net/usb/
+ 
+-obj-$(CONFIG_COMPAT_VAR_MODULES) += drivers/ssb/
+ obj-$(CONFIG_COMPAT_VAR_MODULES) += drivers/bcma/
+ obj-$(CONFIG_COMPAT_VAR_MODULES) += drivers/misc/eeprom/
+ 
+--- a/config.mk
++++ b/config.mk
+@@ -9,7 +9,6 @@ ifeq ($(wildcard $(KLIB_BUILD)/.config),
+  CONFIG_PCI=y
+  CONFIG_USB=y
+  CONFIG_PCMCIA=y
+- CONFIG_SSB=m
+ else
+ include $(KLIB_BUILD)/.config
+ endif
+@@ -354,7 +353,8 @@ CONFIG_IPW2200_QOS=y
+ # % echo 1 > /sys/bus/pci/drivers/ipw2200/*/rtap_iface
+ endif #CONFIG_WIRELESS_EXT
+ 
+-ifdef CONFIG_SSB
++# disabled
++ifdef __CONFIG_SSB
+ # Sonics Silicon Backplane
+ CONFIG_SSB_SPROM=y
+ 
+@@ -367,7 +367,7 @@ endif #CONFIG_PCMCIA
+ # CONFIG_SSB_DEBUG=y
+ CONFIG_SSB_DRIVER_PCICORE=y
+ CONFIG_B43_SSB=y
+-endif #CONFIG_SSB
++endif #__CONFIG_SSB
+ 
+ CONFIG_BCMA=m
+ CONFIG_BCMA_BLOCKIO=y
+@@ -574,7 +574,6 @@ endif #CONFIG_SPI_MASTER end of SPI driv
+ 
+ ifdef CONFIG_MMC
+ 
+-CONFIG_SSB_SDIOHOST=y
+ CONFIG_B43_SDIO=y
+ 
+ ifdef CONFIG_CRC7