X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=package%2Fmac80211%2Fpatches%2F005-disable_ssb_build.patch;h=a67168af64581542529a068710bf25390521d936;hp=3120361a8adc8301349b2ec62134fae7819f6209;hb=ea63948914b33029f287188c4fb984ee9f97e8e0;hpb=9337c975843175aaa51bd285080cb062eb1a3f45

diff --git a/package/mac80211/patches/005-disable_ssb_build.patch b/package/mac80211/patches/005-disable_ssb_build.patch
index 3120361a8a..a67168af64 100644
--- a/package/mac80211/patches/005-disable_ssb_build.patch
+++ b/package/mac80211/patches/005-disable_ssb_build.patch
@@ -1,14 +1,13 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -30,7 +30,7 @@ obj-$(CONFIG_COMPAT_WIRELESS_MODULES) +=
+@@ -32,7 +32,6 @@ 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/
+-obj-$(CONFIG_COMPAT_VAR_MODULES) += drivers/ssb/
+ obj-$(CONFIG_COMPAT_VAR_MODULES) += drivers/bcma/
+ 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),
@@ -19,39 +18,26 @@
  else
  include $(KLIB_BUILD)/.config
  endif
-@@ -285,19 +284,18 @@ CONFIG_IPW2200_QOS=y
+@@ -356,7 +355,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
+ 
+@@ -369,7 +369,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
- 
-@@ -486,7 +484,6 @@ endif #CONFIG_SPI_MASTER end of SPI driv
++endif #__CONFIG_SSB
+ 
+ CONFIG_BCMA=m
+ CONFIG_BCMA_BLOCKIO=y
+@@ -578,7 +578,6 @@ endif #CONFIG_SPI_MASTER end of SPI driv
  
  ifdef CONFIG_MMC