X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/f84043cb6a26b0761008efa98fe9d52fd2dc63c6..39111df10bcc92d6028cdc3884eea1dc31ceb9ff:/package/acx-mac80211/Makefile

diff --git a/package/acx-mac80211/Makefile b/package/acx-mac80211/Makefile
index 7ad0022f6..8b09b43a4 100644
--- a/package/acx-mac80211/Makefile
+++ b/package/acx-mac80211/Makefile
@@ -10,14 +10,12 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=acx-mac80211
-PKG_VERSION:=20070610
+PKG_VERSION:=20071003
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://www.hauke-m.de/fileadmin/acx
-PKG_MD5SUM:=7c6c70722a5a2ad6ad25075467ea4909
-
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_URL:=@SF/acx100
+PKG_MD5SUM:=dff7b396299001724e522d3ccf79c883
 
 PKG_FW_NAME:=tiacx111c16
 PKG_FW_URL:=http://teknoraver.campuslife.it/software/acx-mac80211/
@@ -28,30 +26,30 @@ 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
-  VERSION:=$(PKG_VERSION)+$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE)
-  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
 
+define KernelPackage/acx-mac80211/description
+	Driver for acx111 cards (Mac80211 version)
+endef
+
 $(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 ($(CONFIG_MAC80211),)
-
   PKG_EXTRA_KCONFIG:= \
 	CONFIG_ACX_MAC80211=m \
 	CONFIG_ACX_MAC80211_PCI=m \
 
   PKG_EXTRA_CFLAGS:= \
-	-I$(STAGING_DIR)/usr/include/mac80211 \
 	$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=m,%,$(filter %=m,$(PKG_EXTRA_KCONFIG)))) \
 	$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=y,%,$(filter %=y,$(PKG_EXTRA_KCONFIG)))) \
 
@@ -62,12 +60,12 @@ ifneq ($(CONFIG_MAC80211),)
 		SUBDIRS="$(PKG_BUILD_DIR)" \
 		$(PKG_EXTRA_KCONFIG) \
 		EXTRA_CFLAGS="$(PKG_EXTRA_CFLAGS)" \
+		LINUXINCLUDE="-I$(STAGING_DIR)/usr/include/mac80211 -I$(LINUX_DIR)/include \
+			-include linux/autoconf.h" \
 		V="$(V)" \
 		modules
   endef
 
-endif
-
 define Build/Configure
 endef