From: Nicolas Thill <nico@openwrt.org>
Date: Sat, 29 Sep 2007 12:42:34 +0000 (+0000)
Subject: disable acx & acx-mac80211 on atheros, renable check for CONFIG_MAC80211 in KCONFIG... 
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=170e293e5a2ba9d8fe7028fe723ac44c664eb6ea

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


SVN-Revision: 9065
---

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)