summaryrefslogtreecommitdiff
path: root/package/mac80211/patches/005-disable_ssb_build.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-06-24 19:53:13 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-06-24 19:53:13 +0000
commitc7744447a5312258fb08d8191976d35170ed8faa (patch)
treee56b59dcf552f1cae375d9d5b33716c9dc090e75 /package/mac80211/patches/005-disable_ssb_build.patch
parente2d3555a9110e82b9161ebe2643fc0badd4ec565 (diff)
downloadmtk-20170518-c7744447a5312258fb08d8191976d35170ed8faa.zip
mtk-20170518-c7744447a5312258fb08d8191976d35170ed8faa.tar.gz
mtk-20170518-c7744447a5312258fb08d8191976d35170ed8faa.tar.bz2
mac80211: update to wireless-testing 2011-06-22
SVN-Revision: 27275
Diffstat (limited to 'package/mac80211/patches/005-disable_ssb_build.patch')
-rw-r--r--package/mac80211/patches/005-disable_ssb_build.patch47
1 files changed, 17 insertions, 30 deletions
diff --git a/package/mac80211/patches/005-disable_ssb_build.patch b/package/mac80211/patches/005-disable_ssb_build.patch
index 7a33f68..b067956 100644
--- a/package/mac80211/patches/005-disable_ssb_build.patch
+++ b/package/mac80211/patches/005-disable_ssb_build.patch
@@ -4,8 +4,8 @@
obj-$(CONFIG_COMPAT_NET_USB_MODULES) += drivers/net/usb/
obj-$(CONFIG_COMPAT_NETWORK_MODULES) += drivers/net/
--obj-$(CONFIG_COMPAT_VAR_MODULES) += drivers/ssb/ drivers/misc/eeprom/
-+obj-$(CONFIG_COMPAT_VAR_MODULES) += drivers/misc/eeprom/
+-obj-$(CONFIG_COMPAT_VAR_MODULES) += drivers/ssb/ drivers/bcma/ drivers/misc/eeprom/
++obj-$(CONFIG_COMPAT_VAR_MODULES) += drivers/bcma/ drivers/misc/eeprom/
ifeq ($(CONFIG_STAGING_EXCLUDE_BUILD),)
obj-$(CONFIG_COMPAT_STAGING) += drivers/staging/ath6kl/
@@ -19,39 +19,26 @@
else
include $(KLIB_BUILD)/.config
endif
-@@ -311,19 +310,18 @@ CONFIG_IPW2200_QOS=y
+@@ -314,7 +313,8 @@ CONFIG_IPW2200_QOS=y
# % echo 1 > /sys/bus/pci/drivers/ipw2200/*/rtap_iface
endif #CONFIG_WIRELESS_EXT
-ifdef CONFIG_SSB
--# Sonics Silicon Backplane
--CONFIG_SSB_SPROM=y
--
--CONFIG_SSB_BLOCKIO=y
--CONFIG_SSB_PCIHOST=y
--CONFIG_SSB_B43_PCI_BRIDGE=y
--ifdef CONFIG_PCMCIA
--CONFIG_SSB_PCMCIAHOST=y
--endif #CONFIG_PCMCIA
--# CONFIG_SSB_DEBUG=y
--CONFIG_SSB_DRIVER_PCICORE=y
++# disabled
++ifdef __CONFIG_SSB
+ # Sonics Silicon Backplane
+ CONFIG_SSB_SPROM=y
+
+@@ -327,7 +327,7 @@ endif #CONFIG_PCMCIA
+ # CONFIG_SSB_DEBUG=y
+ CONFIG_SSB_DRIVER_PCICORE=y
+ CONFIG_B43_SSB=y
-endif #CONFIG_SSB
-+# ifdef CONFIG_SSB
-+# # Sonics Silicon Backplane
-+# CONFIG_SSB_SPROM=y
-+# CONFIG_SSB_BLOCKIO=y
-+# CONFIG_SSB_PCIHOST=y
-+# CONFIG_SSB_B43_PCI_BRIDGE=y
-+# ifdef CONFIG_PCMCIA
-+# CONFIG_SSB_PCMCIAHOST=y
-+# endif #CONFIG_PCMCIA
-+# # CONFIG_SSB_DEBUG=y
-+# CONFIG_SSB_DRIVER_PCICORE=y
-+# endif #CONFIG_SSB
-
- CONFIG_P54_PCI=m
-
-@@ -524,7 +522,6 @@ endif #CONFIG_SPI_MASTER end of SPI driv
++endif #__CONFIG_SSB
+
+ CONFIG_BCMA=m
+ CONFIG_BCMA_BLOCKIO=y
+@@ -534,7 +534,6 @@ endif #CONFIG_SPI_MASTER end of SPI driv
ifdef CONFIG_MMC