mac80211: sync with trunk (as of r25965)

[openwrt-10.03/.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 301aa95251886146b76a3fb8f64d37a4c18df8c1..fdfaf507eb6d34772531efb278f6806479cc4fbd 100644 (file)
--- a/package/mac80211/patches/005-disable_ssb_build.patch
+++ b/package/mac80211/patches/005-disable_ssb_build.patch
@@ -6,9 +6,9 @@
  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/
- endif
  
- obj-$(CONFIG_COMPAT_BLUETOOTH) += net/bluetooth/
+ ifeq ($(CONFIG_STAGING_EXCLUDE_BUILD),)
+ obj-$(CONFIG_COMPAT_STAGING) += drivers/staging/ath6kl/
 --- a/config.mk
 +++ b/config.mk
 @@ -9,7 +9,6 @@ ifeq ($(wildcard $(KLIB_BUILD)/.config),
@@ -19,14 +19,13 @@
  else
  include $(KLIB_BUILD)/.config
  endif
-@@ -280,21 +279,6 @@ endif #CONFIG_WEXT_PRIV
- endif #CONFIG_WEXT_SPY
+@@ -300,19 +299,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
-@@ -474,7 +458,6 @@ endif #CONFIG_SPI_MASTER end of SPI driv
+@@ -514,7 +512,6 @@ endif #CONFIG_SPI_MASTER end of SPI driv
  
  ifdef CONFIG_MMC