diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2010-03-10 21:51:17 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2010-03-10 21:51:17 +0000 |
| commit | 4fc10cf894268980cc69254afe45ae29c43b3172 (patch) | |
| tree | 28850640237d849223b2ac9af303f781245ebff1 | |
| parent | a13ab1369e0ef908ea15dbf26956df679fd63963 (diff) | |
| download | upstream-4fc10cf894268980cc69254afe45ae29c43b3172.tar.gz upstream-4fc10cf894268980cc69254afe45ae29c43b3172.tar.bz2 upstream-4fc10cf894268980cc69254afe45ae29c43b3172.zip | |
mac80211: fix build problems with kmod-mac80211=n
Build compat-wireless also if kmod-mac80211=n, but do not build mac80211.ko.
Fix problem in ticket #6813.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20125 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/mac80211/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile index 64352f7027..bd569acfe7 100644 --- a/package/mac80211/Makefile +++ b/package/mac80211/Makefile @@ -606,6 +606,7 @@ MAKE_OPTS:= \ ARCH="$(LINUX_KARCH)" \ EXTRA_CFLAGS="$(BUILDFLAGS)" \ $(foreach opt,$(CONFOPTS),CONFIG_$(opt)=m) \ + CONFIG_MAC80211=$(if $(CONFIG_PACKAGE_kmod-mac80211),m) \ CONFIG_MAC80211_RC_PID=y \ CONFIG_MAC80211_RC_MINSTREL=y \ CONFIG_MAC80211_LEDS=$(CONFIG_LEDS_TRIGGERS) \ @@ -702,7 +703,7 @@ define Build/Prepare rm $(PKG_BUILD_DIR)/include/linux/eeprom_93cx6.h endef -ifneq ($(CONFIG_PACKAGE_kmod-mac80211),) +ifneq ($(CONFIG_PACKAGE_kmod-cfg80211),) define Build/Compile/kmod rm -rf $(PKG_BUILD_DIR)/modules $(MAKE) -C "$(PKG_BUILD_DIR)" $(MAKE_OPTS) all @@ -728,7 +729,7 @@ define KernelPackage/libertas/install $(INSTALL_DATA) $(DL_DIR)/$(USB8388FW_NAME)-$(USB8388FW_VERSION).bin $(1)/lib/firmware/$(USB8388FW_NAME).bin endef -define KernelPackage/mac80211/install +define KernelPackage/cfg80211/install $(INSTALL_DIR) $(1)/lib/wifi $(INSTALL_DATA) ./files/lib/wifi/mac80211.sh $(1)/lib/wifi endef |