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 489d731..9b39e76 100644 (file)
--- a/package/mac80211/patches/005-disable_ssb_build.patch
+++ b/package/mac80211/patches/005-disable_ssb_build.patch
@@ -1,6 +1,6 @@
 --- a/Makefile
 +++ b/Makefile
 --- a/Makefile
 +++ b/Makefile

-@@ -29,7 +29,6 @@ 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/
  


@@ -18,7 +18,7 @@
  else
  include $(KLIB_BUILD)/.config
  endif
  else
  include $(KLIB_BUILD)/.config
  endif

-@@ -315,7 +314,8 @@ CONFIG_IPW2200_QOS=y
+@@ -344,7 +343,8 @@ CONFIG_IPW2200_QOS=y

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


@@ -28,7 +28,7 @@
  # Sonics Silicon Backplane
  CONFIG_SSB_SPROM=y
  
  # Sonics Silicon Backplane
  CONFIG_SSB_SPROM=y
  

-@@ -328,7 +328,7 @@ endif #CONFIG_PCMCIA
+@@ -357,7 +357,7 @@ endif #CONFIG_PCMCIA

  # CONFIG_SSB_DEBUG=y
  CONFIG_SSB_DRIVER_PCICORE=y
  CONFIG_B43_SSB=y
  # CONFIG_SSB_DEBUG=y
  CONFIG_SSB_DRIVER_PCICORE=y
  CONFIG_B43_SSB=y


@@ -37,7 +37,7 @@
  
  CONFIG_BCMA=m
  CONFIG_BCMA_BLOCKIO=y
  
  CONFIG_BCMA=m
  CONFIG_BCMA_BLOCKIO=y

-@@ -537,7 +537,6 @@ endif #CONFIG_SPI_MASTER end of SPI driv
+@@ -568,7 +568,6 @@ endif #CONFIG_SPI_MASTER end of SPI driv

  
  ifdef CONFIG_MMC
  
  
  ifdef CONFIG_MMC