From bb03c545e8fec89bf3b1feae52095b2afd291e84 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 4 Dec 2010 01:32:04 +0000 Subject: mac80211: update to wireless-testing 2010-11-30 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24235 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/mac80211/patches/005-disable_ssb_build.patch | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to '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 fd2907ffe..49be7b4f6 100644 --- a/package/mac80211/patches/005-disable_ssb_build.patch +++ b/package/mac80211/patches/005-disable_ssb_build.patch @@ -19,14 +19,13 @@ else include $(KLIB_BUILD)/.config endif -@@ -283,21 +282,6 @@ CONFIG_IPW2200_QOS=y +@@ -283,19 +282,18 @@ 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_DEBUG=y - -CONFIG_SSB_BLOCKIO=y -CONFIG_SSB_PCIHOST=y @@ -37,11 +36,22 @@ -# CONFIG_SSB_DEBUG=y -CONFIG_SSB_DRIVER_PCICORE=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 - # CONFIG_B44=m -@@ -485,7 +469,6 @@ endif #CONFIG_SPI_MASTER end of SPI driv +@@ -484,7 +482,6 @@ endif #CONFIG_SPI_MASTER end of SPI driv ifdef CONFIG_MMC -- cgit v1.2.3