merge mac80211, iw, hostapd from trunk to backfire

[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 d3154b089f5f4c731df62d5a536a7794d2191efa..fd2907ffe32e71271534927a45fc756ec3419d1f 100644 (file)
--- a/package/mac80211/patches/005-disable_ssb_build.patch
+++ b/package/mac80211/patches/005-disable_ssb_build.patch
@@ -1,11 +1,51 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -28,7 +28,7 @@ obj-$(CONFIG_COMPAT_WIRELESS_MODULES) +=
+@@ -30,7 +30,7 @@ obj-$(CONFIG_COMPAT_WIRELESS_MODULES) +=
  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/
+ 
+ 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),
+  CONFIG_PCI=y
+  CONFIG_USB=y
+  CONFIG_PCMCIA=y
+- CONFIG_SSB=m
+ else
+ include $(KLIB_BUILD)/.config
  endif
+@@ -283,21 +282,6 @@ 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
+-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
+ 
+ ifdef CONFIG_MMC
+ 
+-CONFIG_SSB_SDIOHOST=y
+ CONFIG_B43_SDIO=y
  
- obj-$(CONFIG_COMPAT_BLUETOOTH) += net/bluetooth/
+ ifdef CONFIG_CRC7