diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-09-14 22:53:54 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-09-14 22:53:54 +0000 |
| commit | e30b799cdce79c4fe33c8bd09d2f289baf788382 (patch) | |
| tree | 0bfc5f31cc4ea54f7253c14f510eac831f1495d0 /package/mac80211/patches/005-disable_ssb_build.patch | |
| parent | 872d5928d93dcbb73d86a06bfe3981cbd3e35baf (diff) | |
mac80211: upgrade to wireless-testing 2010-09-14, replace the external carl9170 with the recently merged upstream version
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23061 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/005-disable_ssb_build.patch')
| -rw-r--r-- | package/mac80211/patches/005-disable_ssb_build.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/package/mac80211/patches/005-disable_ssb_build.patch b/package/mac80211/patches/005-disable_ssb_build.patch index e62d48f95..301aa9525 100644 --- a/package/mac80211/patches/005-disable_ssb_build.patch +++ b/package/mac80211/patches/005-disable_ssb_build.patch @@ -19,11 +19,11 @@ else include $(KLIB_BUILD)/.config endif -@@ -275,21 +274,6 @@ CONFIG_IPW2200_QOS=y - # - # % echo 1 > /sys/bus/pci/drivers/ipw2200/*/rtap_iface +@@ -280,21 +279,6 @@ endif #CONFIG_WEXT_PRIV + endif #CONFIG_WEXT_SPY + endif #CONFIG_WIRELESS_EXT --ifneq ($(CONFIG_SSB),) +-ifdef CONFIG_SSB -# Sonics Silicon Backplane -CONFIG_SSB_SPROM=y -# CONFIG_SSB_DEBUG=y @@ -31,21 +31,21 @@ -CONFIG_SSB_BLOCKIO=y -CONFIG_SSB_PCIHOST=y -CONFIG_SSB_B43_PCI_BRIDGE=y --ifneq ($(CONFIG_PCMCIA),) +-ifdef CONFIG_PCMCIA -CONFIG_SSB_PCMCIAHOST=y --endif +-endif #CONFIG_PCMCIA -# CONFIG_SSB_DEBUG=y -CONFIG_SSB_DRIVER_PCICORE=y --endif +-endif #CONFIG_SSB - CONFIG_P54_PCI=m # CONFIG_B44=m -@@ -463,7 +447,6 @@ endif # end of SPI driver list +@@ -474,7 +458,6 @@ endif #CONFIG_SPI_MASTER end of SPI driv - ifneq ($(CONFIG_MMC),) + ifdef CONFIG_MMC -CONFIG_SSB_SDIOHOST=y CONFIG_B43_SDIO=y - ifneq ($(CONFIG_CRC7),) + ifdef CONFIG_CRC7 |