diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-04-16 21:08:41 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-04-16 21:08:41 +0000 |
| commit | c0c371b58134d391f46de6dabf2bd0a96267cb38 (patch) | |
| tree | 7b489799c8ddbfdd0ac3462317ce2be1a41368ed /package/mac80211/patches/005-disable_ssb_build.patch | |
| parent | c379502147ee31e5b429ea8c38ae8c79e158e96a (diff) | |
| download | upstream-c0c371b58134d391f46de6dabf2bd0a96267cb38.tar.gz upstream-c0c371b58134d391f46de6dabf2bd0a96267cb38.tar.bz2 upstream-c0c371b58134d391f46de6dabf2bd0a96267cb38.zip | |
mac80211: update to wireless-testing 2012-04-13
SVN-Revision: 31322
Diffstat (limited to 'package/mac80211/patches/005-disable_ssb_build.patch')
| -rw-r--r-- | package/mac80211/patches/005-disable_ssb_build.patch | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/package/mac80211/patches/005-disable_ssb_build.patch b/package/mac80211/patches/005-disable_ssb_build.patch index 9b39e76be1..0770caadcf 100644 --- a/package/mac80211/patches/005-disable_ssb_build.patch +++ b/package/mac80211/patches/005-disable_ssb_build.patch @@ -1,6 +1,6 @@ --- a/Makefile +++ b/Makefile -@@ -26,7 +26,6 @@ obj-$(CONFIG_COMPAT_WIRELESS_MODULES) += +@@ -29,7 +29,6 @@ obj-$(CONFIG_COMPAT_WIRELESS_MODULES) += obj-$(CONFIG_COMPAT_NET_USB_MODULES) += drivers/net/usb/ @@ -10,15 +10,16 @@ --- 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 +@@ -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 -@@ -344,7 +343,8 @@ CONFIG_IPW2200_QOS=y +@@ -338,7 +338,8 @@ export CONFIG_IPW2200_QOS=y # % echo 1 > /sys/bus/pci/drivers/ipw2200/*/rtap_iface endif #CONFIG_WIRELESS_EXT @@ -26,22 +27,23 @@ +# disabled +ifdef __CONFIG_SSB # Sonics Silicon Backplane - CONFIG_SSB_SPROM=y + export CONFIG_SSB_SPROM=y -@@ -357,7 +357,7 @@ endif #CONFIG_PCMCIA +@@ -351,7 +352,7 @@ endif #CONFIG_PCMCIA # CONFIG_SSB_DEBUG=y - CONFIG_SSB_DRIVER_PCICORE=y - CONFIG_B43_SSB=y + export CONFIG_SSB_DRIVER_PCICORE=y + export CONFIG_B43_SSB=y -endif #CONFIG_SSB +endif #__CONFIG_SSB - CONFIG_BCMA=m - CONFIG_BCMA_BLOCKIO=y -@@ -568,7 +568,6 @@ endif #CONFIG_SPI_MASTER end of SPI driv + export CONFIG_BCMA=m + export CONFIG_BCMA_BLOCKIO=y +@@ -562,7 +563,7 @@ endif #CONFIG_SPI_MASTER end of SPI driv ifdef CONFIG_MMC --CONFIG_SSB_SDIOHOST=y - CONFIG_B43_SDIO=y +-export CONFIG_SSB_SDIOHOST=y ++# export CONFIG_SSB_SDIOHOST=y + export CONFIG_B43_SDIO=y ifdef CONFIG_CRC7 |