aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2007-09-29 12:42:34 +0000
committerNicolas Thill <nico@openwrt.org>2007-09-29 12:42:34 +0000
commit652024b6310a0c6824327eb3a1e3a0b7be22262e (patch)
tree470022f2f144761973f3fdac12d7ab8fc30e1f11
parentcf61b689a8a9f93469aad0bb8650c75fe9a21fce (diff)
downloadmaster-187ad058-652024b6310a0c6824327eb3a1e3a0b7be22262e.tar.gz
master-187ad058-652024b6310a0c6824327eb3a1e3a0b7be22262e.tar.bz2
master-187ad058-652024b6310a0c6824327eb3a1e3a0b7be22262e.zip
disable acx & acx-mac80211 on atheros, renable check for CONFIG_MAC80211 in KCONFIG in acx-mac80211 so that it does not get built on pre 2.6.22
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9065 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/acx-mac80211/Makefile5
-rw-r--r--package/acx/Makefile3
2 files changed, 5 insertions, 3 deletions
diff --git a/package/acx-mac80211/Makefile b/package/acx-mac80211/Makefile
index 7bc37ee84c..51a6ce37ff 100644
--- a/package/acx-mac80211/Makefile
+++ b/package/acx-mac80211/Makefile
@@ -26,12 +26,13 @@ ifeq ($(DUMP),)
include $(LINUX_DIR)/.config
endif
+# XXX: remove @!TARGET_* later when we have PCI support properly detected on all targets
define KernelPackage/acx-mac80211
SUBMENU:=Wireless Drivers
TITLE:=ACX111 Mac80211 driver
DESCRIPTION:=Driver for acx111 cards (Mac80211 version)
- DEPENDS:=@LINUX_2_6 +kmod-mac80211
-# KCONFIG:=CONFIG_MAC80211
+ DEPENDS:=@LINUX_2_6 +kmod-mac80211 @!TARGET_atheros
+ KCONFIG:=CONFIG_MAC80211
FILES:=$(PKG_BUILD_DIR)/acx-mac80211.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,50,acx-mac80211)
endef
diff --git a/package/acx/Makefile b/package/acx/Makefile
index f09bd447b1..d10398f7fc 100644
--- a/package/acx/Makefile
+++ b/package/acx/Makefile
@@ -28,9 +28,10 @@ PKG_UNPACK:= \
include $(INCLUDE_DIR)/package.mk
+# XXX: remove @!TARGET_* later when we have PCI support properly detected on all targets
define KernelPackage/acx
TITLE:=Driver for TI ACX1xx chipset
- DEPENDS:=@LINUX_2_6 @!TARGET_avr32 +wireless-tools
+ DEPENDS:=@LINUX_2_6 +wireless-tools @!TARGET_atheros @!TARGET_avr32
URL:=http://acx100.sourceforge.net/
SUBMENU:=Wireless Drivers
FILES:= $(PKG_BUILD_DIR)/acx.$(LINUX_KMOD_SUFFIX)