mac80211: update to wireless-testing 2012-06-14

[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 7a4c513..23ce924 100644 (file)
--- a/package/mac80211/patches/005-disable_ssb_build.patch
+++ b/package/mac80211/patches/005-disable_ssb_build.patch
@@ -1,14 +1,49 @@
-diff --git a/Makefile b/Makefile
-index 6a5eff4..225c711 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -20,8 +20,7 @@ NOSTDINC_FLAGS := -I$(M)/include/ -include $(M)/include/net/compat.h $(CFLAGS)
- obj-y := net/wireless/ net/mac80211/
- ifeq ($(ONLY_CORE),)
- obj-$(CONFIG_B44) += drivers/net/b44.o
--obj-y += drivers/ssb/ \
--      drivers/misc/ \
-+obj-y += drivers/misc/ \
-       drivers/net/usb/ \
-       drivers/net/wireless/
+@@ -44,7 +44,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
+@@ -3,7 +3,7 @@ ifeq ($(wildcard $(KLIB_BUILD)/.config),
+  export CONFIG_PCI=y
+  export CONFIG_USB=y
+  export CONFIG_PCMCIA=y
+- export CONFIG_SSB=m
++# export CONFIG_SSB=m
+ else
+ include $(KLIB_BUILD)/.config
  endif
+@@ -347,7 +347,8 @@ export 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
+ export CONFIG_SSB_SPROM=y
+ 
+@@ -360,7 +361,7 @@ endif #CONFIG_PCMCIA
+ # export CONFIG_SSB_DEBUG=y
+ export CONFIG_SSB_DRIVER_PCICORE=y
+ export CONFIG_B43_SSB=y
+-endif #CONFIG_SSB
++endif #__CONFIG_SSB
+ 
+ export CONFIG_BCMA=m
+ export CONFIG_BCMA_BLOCKIO=y
+@@ -577,7 +578,7 @@ endif #CONFIG_SPI_MASTER end of SPI driv
+ 
+ ifdef CONFIG_MMC
+ 
+-export CONFIG_SSB_SDIOHOST=y
++# export CONFIG_SSB_SDIOHOST=y
+ export CONFIG_B43_SDIO=y
+ 
+ ifdef CONFIG_CRC7