From 18c64a209defa2e399a6b51a2b3954440867a2ca Mon Sep 17 00:00:00 2001
From: =?utf8?q?Michael=20B=C3=BCsch?= <mb@bu3sch.de>
Date: Tue, 17 Mar 2009 22:46:51 +0000
Subject: [PATCH] b43: More non-PCI fixes

SVN-Revision: 14933
---
 package/mac80211/Makefile                     | 10 ++++--
 .../patches/007-remove_unused_stuff.patch     | 33 +++++++++++++++++--
 2 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index 50e63db67b..de3b4c5d26 100644
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -379,10 +379,12 @@ endef
 BUILDFLAGS:= \
 	-I$(PKG_BUILD_DIR)/include \
 	$(foreach opt,$(CONFOPTS),-DCONFIG_$(opt)) \
-	$(if $(CONFIG_PCI), -DCONFIG_B43_PCI_AUTOSELECT -DCONFIG_B43_PCICORE_AUTOSELECT -DCONFIG_SSB_DRIVER_PCICORE_POSSIBLE -DCONFIG_SSB_DRIVER_PCICORE) \
+	$(if $(CONFIG_PCI),-DCONFIG_B43_PCI_AUTOSELECT -DCONFIG_B43_PCICORE_AUTOSELECT -DCONFIG_SSB_DRIVER_PCICORE_POSSIBLE -DCONFIG_SSB_DRIVER_PCICORE) \
+	$(if $(CONFIG_PCI),-DCONFIG_SSB_PCIHOST_POSSIBLE -DCONFIG_SSB_PCIHOST) \
+	$(if $(CONFIG_PCI),-DCONFIG_SSB_SPROM) \
 	$(if $(CONFIG_LEDS_TRIGGERS), -DCONFIG_MAC80211_LEDS -DCONFIG_LEDS_TRIGGERS -DCONFIG_B43_LEDS -DCONFIG_B43LEGACY_LEDS) \
 	$(if $(CONFIG_RFKILL),-DCONFIG_B43_RFKILL -DCONFIG_B43LEGACY_RFKILL) \
-	$(if $(CONFIG_PCMCIA),-DCONFIG_B43_PCMCIA -DCONFIG_B43_PIO) \
+	$(if $(CONFIG_PCMCIA),-DCONFIG_SSB_PCMCIAHOST_POSSIBLE -DCONFIG_SSB_PCMCIAHOST -DCONFIG_B43_PCMCIA -DCONFIG_B43_PIO) \
 	$(if $(CONFIG_DEBUG_FS), -DCONFIG_MAC80211_DEBUGFS) \
 	-D__CONFIG_MAC80211_RC_DEFAULT=minstrel \
 
@@ -400,6 +402,10 @@ MAKE_OPTS:= \
 	$(if $(CONFIG_PCI),CONFIG_B43_PCICORE_AUTOSELECT=y,CONFIG_B43_PCICORE_AUTOSELECT=n) \
 	$(if $(CONFIG_PCI),CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y,CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=n) \
 	$(if $(CONFIG_PCI),CONFIG_SSB_DRIVER_PCICORE=y,CONFIG_SSB_DRIVER_PCICORE=n) \
+	$(if $(CONFIG_PCI),CONFIG_SSB_PCIHOST_POSSIBLE=y,CONFIG_SSB_PCIHOST_POSSIBLE=n) \
+	$(if $(CONFIG_PCI),CONFIG_SSB_PCIHOST=y,CONFIG_SSB_PCIHOST=n) \
+	$(if $(CONFIG_PCMCIA),CONFIG_SSB_PCMCIAHOST_POSSIBLE=y,CONFIG_SSB_PCMCIAHOST_POSSIBLE=n) \
+	$(if $(CONFIG_PCMCIA),CONFIG_SSB_PCMCIAHOST=y,CONFIG_SSB_PCMCIAHOST=n) \
 	$(if $(CONFIG_PCMCIA),CONFIG_B43_PCMCIA=y,CONFIG_B43_PCMCIA=n) \
 	$(if $(CONFIG_PCMCIA),CONFIG_B43_PIO=y,CONFIG_B43_PIO=n) \
 	$(if $(CONFIG_RFKILL),CONFIG_B43_RFKILL=y,CONFIG_B43_RFKILL=n) \
diff --git a/package/mac80211/patches/007-remove_unused_stuff.patch b/package/mac80211/patches/007-remove_unused_stuff.patch
index 0f07933395..965416d147 100644
--- a/package/mac80211/patches/007-remove_unused_stuff.patch
+++ b/package/mac80211/patches/007-remove_unused_stuff.patch
@@ -1,7 +1,7 @@
 Index: compat-wireless-2009-03-13/config.mk
 ===================================================================
---- compat-wireless-2009-03-13.orig/config.mk	2009-03-17 21:15:23.000000000 +0100
-+++ compat-wireless-2009-03-13/config.mk	2009-03-17 21:18:05.000000000 +0100
+--- compat-wireless-2009-03-13.orig/config.mk	2009-03-17 23:34:31.000000000 +0100
++++ compat-wireless-2009-03-13/config.mk	2009-03-17 23:40:08.000000000 +0100
 @@ -91,10 +91,10 @@ CONFIG_MAC80211_MESH=y
  CONFIG_CFG80211=m
  # CONFIG_CFG80211_REG_DEBUG is not set
@@ -68,7 +68,34 @@ Index: compat-wireless-2009-03-13/config.mk
  # CONFIG_IPW2200_DEBUG is not set
  # The above enables use a second interface prefixed 'rtap'.
  #           Example usage:
-@@ -283,15 +283,15 @@ CONFIG_SSB_SPROM=y
+@@ -176,13 +176,13 @@ CONFIG_IPW2200_QOS=y
+ # % echo 1 > /sys/bus/pci/drivers/ipw2200/*/rtap_iface
+ 
+ CONFIG_SSB_BLOCKIO=y
+-CONFIG_SSB_PCIHOST_POSSIBLE=y
+-CONFIG_SSB_PCIHOST=y
++# CONFIG_SSB_PCIHOST_POSSIBLE=y
++# CONFIG_SSB_PCIHOST=y
+ CONFIG_SSB_B43_PCI_BRIDGE=y
+-CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
+-CONFIG_SSB_PCMCIAHOST=y
+-CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+-CONFIG_SSB_DRIVER_PCICORE=y
++# CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
++# CONFIG_SSB_PCMCIAHOST=y
++# CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
++# CONFIG_SSB_DRIVER_PCICORE=y
+ 
+ CONFIG_P54_PCI=m
+ 
+@@ -277,21 +277,21 @@ CONFIG_P54_COMMON=m
+ # Sonics Silicon Backplane
+ CONFIG_SSB_POSSIBLE=y
+ CONFIG_SSB=m
+-CONFIG_SSB_SPROM=y
++# CONFIG_SSB_SPROM=y
+ # CONFIG_SSB_DEBUG is not set
+ 
  ifneq ($(CONFIG_USB),)
  ifneq ($(CONFIG_LIBERTAS_THINFIRM_USB),m)
  CONFIG_LIBERTAS_USB=m
-- 
2.30.2