From 3889c76a6e723da1dde8403c40ea04e751577770 Mon Sep 17 00:00:00 2001
From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Fri, 19 Feb 2010 15:41:55 +0000
Subject: [PATCH] remove pcmcia and sdio

This fixes #6701

Remove the pcmcia and sdio interface from b43 driver to not depend on these modules.

SVN-Revision: 19756
---
 package/mac80211/Makefile                     |  2 +-
 package/mac80211/patches/010-no_pcmcia.patch  | 20 ++++++++++++++++++-
 package/mac80211/patches/011-no_sdio.patch    | 13 ++++++++++++
 .../patches/120-linux-2.6.30-compat.patch     |  2 +-
 4 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 package/mac80211/patches/011-no_sdio.patch

diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index d8fb260e55d8..5d28c6b32e02 100644
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=mac80211
 
 PKG_VERSION:=2010-02-16
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources
 #	http://www.orbit-lab.org/kernel/compat-wireless-2.6/2010/11 \
 #	http://wireless.kernel.org/download/compat-wireless-2.6
diff --git a/package/mac80211/patches/010-no_pcmcia.patch b/package/mac80211/patches/010-no_pcmcia.patch
index 3ef315b3ad67..1334dbb1410c 100644
--- a/package/mac80211/patches/010-no_pcmcia.patch
+++ b/package/mac80211/patches/010-no_pcmcia.patch
@@ -5,7 +5,25 @@
   CONFIG_PCI=y
   CONFIG_USB=y
 - CONFIG_PCMCIA=y
-+ # CONFIG_PCMCIA=y
++# CONFIG_PCMCIA=y
   CONFIG_SSB=m
  else
  include $(KLIB_BUILD)/.config
+@@ -197,7 +197,7 @@ CONFIG_B43=m
+ CONFIG_B43_HWRNG=y
+ CONFIG_B43_PCI_AUTOSELECT=y
+ ifneq ($(CONFIG_PCMCIA),)
+-CONFIG_B43_PCMCIA=y
++# CONFIG_B43_PCMCIA=y
+ endif
+ CONFIG_B43_LEDS=y
+ CONFIG_B43_PHY_LP=y
+@@ -248,7 +248,7 @@ CONFIG_SSB_BLOCKIO=y
+ CONFIG_SSB_PCIHOST=y
+ CONFIG_SSB_B43_PCI_BRIDGE=y
+ ifneq ($(CONFIG_PCMCIA),)
+-CONFIG_SSB_PCMCIAHOST=y
++# CONFIG_SSB_PCMCIAHOST=y
+ endif
+ # CONFIG_SSB_DEBUG=y
+ CONFIG_SSB_DRIVER_PCICORE=y
diff --git a/package/mac80211/patches/011-no_sdio.patch b/package/mac80211/patches/011-no_sdio.patch
new file mode 100644
index 000000000000..aa651edd22b6
--- /dev/null
+++ b/package/mac80211/patches/011-no_sdio.patch
@@ -0,0 +1,13 @@
+--- a/config.mk
++++ b/config.mk
+@@ -382,8 +382,8 @@ endif # end of SPI driver list
+ 
+ ifneq ($(CONFIG_MMC),)
+ 
+-CONFIG_SSB_SDIOHOST=y
+-CONFIG_B43_SDIO=y
++# CONFIG_SSB_SDIOHOST=y
++# CONFIG_B43_SDIO=y
+ CONFIG_WL1251_SDIO=m
+ 
+ ifdef CONFIG_COMPAT_KERNEL_27
diff --git a/package/mac80211/patches/120-linux-2.6.30-compat.patch b/package/mac80211/patches/120-linux-2.6.30-compat.patch
index de4654511613..da5966e15305 100644
--- a/package/mac80211/patches/120-linux-2.6.30-compat.patch
+++ b/package/mac80211/patches/120-linux-2.6.30-compat.patch
@@ -1,6 +1,6 @@
 --- a/net/wireless/nl80211.c
 +++ b/net/wireless/nl80211.c
-@@ -5667,7 +5667,11 @@
+@@ -5662,7 +5662,11 @@ int nl80211_send_action(struct cfg80211_
  		return err;
  	}
  
-- 
2.30.2