aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/Makefile
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2010-05-15 11:04:53 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2010-05-15 11:04:53 +0000
commitcfec944f426b948f8bd5ef81e402c81e29e3eb1c (patch)
tree98286029c58af347d1c905ab54172d36ddb175fb /package/mac80211/Makefile
parent01d8285e472e3103a11a6583d2c6c3ccf1acb198 (diff)
downloadupstream-cfec944f426b948f8bd5ef81e402c81e29e3eb1c.tar.gz
upstream-cfec944f426b948f8bd5ef81e402c81e29e3eb1c.tar.bz2
upstream-cfec944f426b948f8bd5ef81e402c81e29e3eb1c.zip
ssb: activate CONFIG_SSB_BLOCKIO in the kernel and not in compat-wireless.
Before this patch CONFIG_SSB_BLOCKIO was set to y in compat-wireless but the in kernel ssb system had it set to n, this causes an invalid pointer. b43 now needs CONFIG_SSB_BLOCKIO=y SVN-Revision: 21449
Diffstat (limited to 'package/mac80211/Makefile')
-rw-r--r--package/mac80211/Makefile8
1 files changed, 1 insertions, 7 deletions
diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index 78c8aa37d1..a91878178b 100644
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -773,9 +773,7 @@ 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_SSB_PCIHOST_POSSIBLE -DCONFIG_SSB_PCIHOST) \
- $(if $(CONFIG_PCI),-DCONFIG_SSB_SPROM) \
+ $(if $(CONFIG_PCI),-DCONFIG_B43_PCI_AUTOSELECT -DCONFIG_B43_PCICORE_AUTOSELECT) \
$(if $(CONFIG_LEDS_TRIGGERS), -DCONFIG_MAC80211_LEDS -DCONFIG_LEDS_TRIGGERS -DCONFIG_B43_LEDS -DCONFIG_B43LEGACY_LEDS -DCONFIG_AR9170_LEDS) \
-DCONFIG_B43_HWRNG -DCONFIG_B43LEGACY_HWRNG \
$(if $(CONFIG_PACKAGE_MAC80211_DEBUGFS),-DCONFIG_MAC80211_DEBUGFS -DCONFIG_ATH9K_DEBUGFS) \
@@ -808,10 +806,6 @@ MAKE_OPTS:= \
CONFIG_B43_PCMCIA=n CONFIG_B43_PIO=n \
CONFIG_B43_PCI_AUTOSELECT=$(if $(CONFIG_PCI),y) \
CONFIG_B43_PCICORE_AUTOSELECT=$(if $(CONFIG_PCI),y) \
- CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=$(if $(CONFIG_PCI),y) \
- CONFIG_SSB_DRIVER_PCICORE=$(if $(CONFIG_PCI),y) \
- CONFIG_SSB_PCIHOST_POSSIBLE=$(if $(CONFIG_PCI),y) \
- CONFIG_SSB_PCIHOST=$(if $(CONFIG_PCI),y) \
CONFIG_B43LEGACY_LEDS=$(CONFIG_LEDS_TRIGGERS) \
CONFIG_B43_LEDS=$(CONFIG_LEDS_TRIGGERS) \
CONFIG_B43_HWRNG=$(if $(CONFIG_HW_RANDOM),y) \