[package] ppp: use service_kill()

[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 7a4c513..301aa95 100644 (file)
--- a/package/mac80211/patches/005-disable_ssb_build.patch
+++ b/package/mac80211/patches/005-disable_ssb_build.patch
@@ -1,14 +1,51 @@
-diff --git a/Makefile b/Makefile
-index 6a5eff4..225c711 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -20,8 +20,7 @@ NOSTDINC_FLAGS := -I$(M)/include/ -include $(M)/include/net/compat.h $(CFLAGS)
- obj-y := net/wireless/ net/mac80211/
- ifeq ($(ONLY_CORE),)
- obj-$(CONFIG_B44) += drivers/net/b44.o
--obj-y += drivers/ssb/ \
--      drivers/misc/ \
-+obj-y += drivers/misc/ \
-       drivers/net/usb/ \
-       drivers/net/wireless/
+@@ -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/
  endif
+ 
+ obj-$(CONFIG_COMPAT_BLUETOOTH) += net/bluetooth/
+--- 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
+@@ -280,21 +279,6 @@ endif #CONFIG_WEXT_PRIV
+ endif #CONFIG_WEXT_SPY
+ 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
+@@ -474,7 +458,6 @@ endif #CONFIG_SPI_MASTER end of SPI driv
+ 
+ ifdef CONFIG_MMC
+ 
+-CONFIG_SSB_SDIOHOST=y
+ CONFIG_B43_SDIO=y
+ 
+ ifdef CONFIG_CRC7