aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorMichael Büsch <mb@bu3sch.de>2009-03-17 21:00:44 +0000
committerMichael Büsch <mb@bu3sch.de>2009-03-17 21:00:44 +0000
commit06c36d9c5bc6efffccc3c6be8b40edac182aa66a (patch)
tree0833125abd2f882ccf1718aa89f812c7ba063203 /package
parentd17716e16f52a69fd911c6d3ff506a7ab246dbc2 (diff)
downloadupstream-06c36d9c5bc6efffccc3c6be8b40edac182aa66a.tar.gz
upstream-06c36d9c5bc6efffccc3c6be8b40edac182aa66a.tar.bz2
upstream-06c36d9c5bc6efffccc3c6be8b40edac182aa66a.zip
b43: Fix for non-PCI builds
SVN-Revision: 14932
Diffstat (limited to 'package')
-rw-r--r--package/mac80211/Makefile14
-rw-r--r--package/mac80211/patches/007-remove_unused_stuff.patch21
2 files changed, 24 insertions, 11 deletions
diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index b3b73fb32d..50e63db67b 100644
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -379,9 +379,10 @@ 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_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) \
+ $(if $(CONFIG_PCMCIA),-DCONFIG_B43_PCMCIA -DCONFIG_B43_PIO) \
$(if $(CONFIG_DEBUG_FS), -DCONFIG_MAC80211_DEBUGFS) \
-D__CONFIG_MAC80211_RC_DEFAULT=minstrel \
@@ -395,9 +396,14 @@ MAKE_OPTS:= \
CONFIG_MAC80211_RC_MINSTREL=y \
CONFIG_MAC80211_LEDS=$(CONFIG_LEDS_TRIGGERS) \
CONFIG_MAC80211_DEBUGFS=$(CONFIG_DEBUG_FS) \
- CONFIG_B43_PCMCIA=$(CONFIG_PCMCIA) \
- $(if $(CONFIG_RFKILL),CONFIG_B43_RFKILL=y) \
- $(if $(CONFIG_RFKILL),CONFIG_B43LEGACY_RFKILL=y) \
+ $(if $(CONFIG_PCI),CONFIG_B43_PCI_AUTOSELECT=y,CONFIG_B43_PCI_AUTOSELECT=n) \
+ $(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_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) \
+ $(if $(CONFIG_RFKILL),CONFIG_B43LEGACY_RFKILL=y,CONFIG_B43LEGACY_RFKILL=n) \
CONFIG_B43LEGACY_LEDS=$(CONFIG_LEDS_TRIGGERS) \
CONFIG_B43_LEDS=$(CONFIG_LEDS_TRIGGERS) \
$(if $(CONFIG_PACKAGE_kmod-b43),CONFIG_B43=m) \
diff --git a/package/mac80211/patches/007-remove_unused_stuff.patch b/package/mac80211/patches/007-remove_unused_stuff.patch
index a8f167f13a..0f07933395 100644
--- a/package/mac80211/patches/007-remove_unused_stuff.patch
+++ b/package/mac80211/patches/007-remove_unused_stuff.patch
@@ -1,5 +1,7 @@
---- a/config.mk
-+++ b/config.mk
+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
@@ -91,10 +91,10 @@ CONFIG_MAC80211_MESH=y
CONFIG_CFG80211=m
# CONFIG_CFG80211_REG_DEBUG is not set
@@ -15,14 +17,19 @@
CONFIG_NL80211=y
-@@ -131,16 +131,16 @@ CONFIG_IWL3945_LEDS=y
+@@ -129,18 +129,18 @@ CONFIG_IWL3945_LEDS=y
+
+
CONFIG_B43=m
- CONFIG_B43_PCI_AUTOSELECT=y
- CONFIG_B43_PCICORE_AUTOSELECT=y
+-CONFIG_B43_PCI_AUTOSELECT=y
+-CONFIG_B43_PCICORE_AUTOSELECT=y
-CONFIG_B43_PCMCIA=y
-+# CONFIG_B43_PCMCIA=y
- CONFIG_B43_PIO=y
+-CONFIG_B43_PIO=y
-CONFIG_B43_LEDS=y
++# CONFIG_B43_PCI_AUTOSELECT=y
++# CONFIG_B43_PCICORE_AUTOSELECT=y
++# CONFIG_B43_PCMCIA=y
++# CONFIG_B43_PIO=y
+# CONFIG_B43_LEDS=y
# CONFIG_B43_RFKILL=y
# CONFIG_B43_DEBUG is not set