[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 7207d7b..301aa95 100644 (file)
--- a/package/mac80211/patches/005-disable_ssb_build.patch
+++ b/package/mac80211/patches/005-disable_ssb_build.patch
@@ -19,11 +19,11 @@
  else
  include $(KLIB_BUILD)/.config
  endif
  else
  include $(KLIB_BUILD)/.config
  endif

-@@ -251,21 +250,6 @@ CONFIG_IPW2200_QOS=y
- #
- # % echo 1 > /sys/bus/pci/drivers/ipw2200/*/rtap_iface
+@@ -280,21 +279,6 @@ endif #CONFIG_WEXT_PRIV
+ endif #CONFIG_WEXT_SPY
+ endif #CONFIG_WIRELESS_EXT

  
  

--ifneq ($(CONFIG_SSB),)
+-ifdef CONFIG_SSB

 -# Sonics Silicon Backplane
 -CONFIG_SSB_SPROM=y
 -# CONFIG_SSB_DEBUG=y
 -# Sonics Silicon Backplane
 -CONFIG_SSB_SPROM=y
 -# CONFIG_SSB_DEBUG=y


@@ -31,21 +31,21 @@
 -CONFIG_SSB_BLOCKIO=y
 -CONFIG_SSB_PCIHOST=y
 -CONFIG_SSB_B43_PCI_BRIDGE=y
 -CONFIG_SSB_BLOCKIO=y
 -CONFIG_SSB_PCIHOST=y
 -CONFIG_SSB_B43_PCI_BRIDGE=y

--ifneq ($(CONFIG_PCMCIA),)
+-ifdef CONFIG_PCMCIA

 -CONFIG_SSB_PCMCIAHOST=y
 -CONFIG_SSB_PCMCIAHOST=y

--endif
+-endif #CONFIG_PCMCIA

 -# CONFIG_SSB_DEBUG=y
 -CONFIG_SSB_DRIVER_PCICORE=y
 -# CONFIG_SSB_DEBUG=y
 -CONFIG_SSB_DRIVER_PCICORE=y

--endif
+-endif #CONFIG_SSB

 -
  CONFIG_P54_PCI=m
  
  # CONFIG_B44=m
 -
  CONFIG_P54_PCI=m
  
  # CONFIG_B44=m

-@@ -429,7 +413,6 @@ endif # end of SPI driver list
+@@ -474,7 +458,6 @@ endif #CONFIG_SPI_MASTER end of SPI driv

  
  

- 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