From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Wed, 19 Jun 2013 21:37:56 +0000 (+0000)
Subject: acx-mac80211: make it compile with the new backports mac80211
X-Git-Tag: reboot~10192
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7cbbd24d64efa695afbd37a7732314e8b2bf4253;p=openwrt%2Fstaging%2Fblogic.git

acx-mac80211: make it compile with the new backports mac80211

SVN-Revision: 36976
---

diff --git a/package/acx-mac80211/Makefile b/package/acx-mac80211/Makefile
index 30c375eabb0f..3e4984d59d6d 100644
--- a/package/acx-mac80211/Makefile
+++ b/package/acx-mac80211/Makefile
@@ -180,6 +180,9 @@ PKG_EXTRA_CFLAGS:= \
 	$(if $(CONFIG_LEDS_TRIGGERS), -DCONFIG_MAC80211_LEDS -DCONFIG_LEDS_TRIGGERS) \
 	$(if $(CONFIG_PACKAGE_MAC80211_DEBUGFS), -DCONFIG_CFG80211_DEBUGFS -DCONFIG_MAC80211_DEBUGFS) \
 	$(if $(CONFIG_PACKAGE_MAC80211_MESH), -DCONFIG_MAC80211_MESH) \
+	-DBACKPORTED_KERNEL_NAME=\\\"$(PKG_SOURCE)\\\" \
+	-DBACKPORTED_KERNEL_VERSION=\\\"$(PKG_SOURCE_VERSION)\\\" \
+	-DBACKPORTS_VERSION=\\\"unknown\\\" \
 
 define Build/Compile
 	$(MAKE) -C "$(LINUX_DIR)" \
@@ -188,12 +191,13 @@ define Build/Compile
 		SUBDIRS="$(PKG_BUILD_DIR)" \
 		$(PKG_EXTRA_KCONFIG) \
 		EXTRA_CFLAGS="$(PKG_EXTRA_CFLAGS) -DCONFIG_ACX_MAC80211_VERSION=\"KERNEL_VERSION(3,10,0)\"" \
-		LINUXINCLUDE="-I$(STAGING_DIR)/usr/include/mac80211/uapi -I$(STAGING_DIR)/usr/include/mac80211 \
+		LINUXINCLUDE="-I$(STAGING_DIR)/usr/include/mac80211-backport/uapi -I$(STAGING_DIR)/usr/include/mac80211-backport \
+			-I$(STAGING_DIR)/usr/include/mac80211/uapi -I$(STAGING_DIR)/usr/include/mac80211 \
 			-I$(LINUX_DIR)/include -I$(LINUX_DIR)/include/$(LINUX_UAPI_DIR) \
 			-I$(LINUX_DIR)/include/generated/uapi/ -Iarch/$(LINUX_KARCH)/include \
 			-Iarch/$(LINUX_KARCH)/include/$(LINUX_UAPI_DIR) \
 			-include generated/autoconf.h \
-			-include linux/compat-2.6.h" \
+			-include backport/backport.h " \
 		V="$(V)" \
 		modules
 endef