From 85c1d5c75138d7110b998553544cf6a4907aecc4 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 10 Nov 2007 15:23:02 +0000 Subject: clean up mac80211 related kernel version deps git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9522 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/acx-mac80211/Makefile | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'package/acx-mac80211') diff --git a/package/acx-mac80211/Makefile b/package/acx-mac80211/Makefile index a3c16ec09..33f7512d8 100644 --- a/package/acx-mac80211/Makefile +++ b/package/acx-mac80211/Makefile @@ -27,8 +27,7 @@ include $(INCLUDE_DIR)/package.mk define KernelPackage/acx-mac80211 SUBMENU:=Wireless Drivers TITLE:=ACX111 Mac80211 driver - DEPENDS:=@LINUX_2_6 +kmod-mac80211 @!TARGET_atheros -# KCONFIG:=CONFIG_MAC80211 + DEPENDS:=+kmod-mac80211 @!TARGET_atheros FILES:=$(PKG_BUILD_DIR)/acx-mac80211.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,acx-mac80211) endef @@ -42,16 +41,15 @@ $(STAMP_BUILT): $(DL_DIR)/$(PKG_FW_NAME) $(DL_DIR)/$(PKG_FW_NAME): $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_FW_NAME)" "$(PKG_FW_MD5SUM)" $(PKG_FW_URL) -ifneq ($(findstring 2.6.23,$(LINUX_VERSION)),) - PKG_EXTRA_KCONFIG:= \ +PKG_EXTRA_KCONFIG:= \ CONFIG_ACX_MAC80211=m \ CONFIG_ACX_MAC80211_PCI=m \ - PKG_EXTRA_CFLAGS:= \ +PKG_EXTRA_CFLAGS:= \ $(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=m,%,$(filter %=m,$(PKG_EXTRA_KCONFIG)))) \ $(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=y,%,$(filter %=y,$(PKG_EXTRA_KCONFIG)))) \ - define Build/Compile +define Build/Compile $(MAKE) -C "$(LINUX_DIR)" \ ARCH="$(LINUX_KARCH)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ @@ -62,10 +60,7 @@ ifneq ($(findstring 2.6.23,$(LINUX_VERSION)),) -include linux/autoconf.h" \ V="$(V)" \ modules - endef -else - override CONFIG_PACKAGE_kmod-acx-mac80211= -endif +endef define Build/Configure endef -- cgit v1.2.3