kernel: update linux 3.2 to 3.2.9

[openwrt.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 9edb690..9b39e76 100644 (file)
--- 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
 --- a/Makefile
 +++ b/Makefile

-@@ -28,7 +28,7 @@ obj-$(CONFIG_COMPAT_WIRELESS_MODULES) +=
+@@ -26,7 +26,6 @@ obj-$(CONFIG_COMPAT_WIRELESS_MODULES) +=
+ 

  obj-$(CONFIG_COMPAT_NET_USB_MODULES) += drivers/net/usb/
  
  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/
- endif
+-obj-$(CONFIG_COMPAT_VAR_MODULES) += drivers/ssb/
+ obj-$(CONFIG_COMPAT_VAR_MODULES) += drivers/bcma/
+ obj-$(CONFIG_COMPAT_VAR_MODULES) += drivers/misc/eeprom/

  
  

- obj-$(CONFIG_COMPAT_BLUETOOTH) += net/bluetooth/

 --- a/config.mk
 +++ b/config.mk
 @@ -9,7 +9,6 @@ ifeq ($(wildcard $(KLIB_BUILD)/.config),
 --- a/config.mk
 +++ b/config.mk
 @@ -9,7 +9,6 @@ ifeq ($(wildcard $(KLIB_BUILD)/.config),


@@ -19,33 +18,30 @@
  else
  include $(KLIB_BUILD)/.config
  endif
  else
  include $(KLIB_BUILD)/.config
  endif

-@@ -239,21 +238,6 @@ CONFIG_IPW2200_QOS=y
- #
+@@ -344,7 +343,8 @@ CONFIG_IPW2200_QOS=y

  # % echo 1 > /sys/bus/pci/drivers/ipw2200/*/rtap_iface
  # % echo 1 > /sys/bus/pci/drivers/ipw2200/*/rtap_iface

+ endif #CONFIG_WIRELESS_EXT
+ 
+-ifdef CONFIG_SSB
++# disabled
++ifdef __CONFIG_SSB
+ # Sonics Silicon Backplane
+ CONFIG_SSB_SPROM=y
+ 
+@@ -357,7 +357,7 @@ endif #CONFIG_PCMCIA
+ # CONFIG_SSB_DEBUG=y
+ CONFIG_SSB_DRIVER_PCICORE=y
+ CONFIG_B43_SSB=y
+-endif #CONFIG_SSB
++endif #__CONFIG_SSB
+ 
+ CONFIG_BCMA=m
+ CONFIG_BCMA_BLOCKIO=y
+@@ -568,7 +568,6 @@ endif #CONFIG_SPI_MASTER end of SPI driv

  
  

--ifneq ($(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
--ifneq ($(CONFIG_PCMCIA),)
--CONFIG_SSB_PCMCIAHOST=y
--endif
--# CONFIG_SSB_DEBUG=y
--CONFIG_SSB_DRIVER_PCICORE=y
--endif
--
- CONFIG_P54_PCI=m
- 
- # CONFIG_B44=m
-@@ -411,7 +395,6 @@ endif # end of SPI driver list
- 
- ifneq ($(CONFIG_MMC),)
+ ifdef CONFIG_MMC

  
 -CONFIG_SSB_SDIOHOST=y
  CONFIG_B43_SDIO=y
  
 -CONFIG_SSB_SDIOHOST=y
  CONFIG_B43_SDIO=y

- CONFIG_WL1251_SDIO=m

  
  

+ ifdef CONFIG_CRC7