From 168a565cbd7f64a66ed992d08b74622ced0e8d45 Mon Sep 17 00:00:00 2001
From: Hauke Mehrtens <hauke@openwrt.org>
Date: Sun, 11 Jul 2010 19:00:23 +0000
Subject: kernel: fix build problems with recent kernel versions

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22137 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/acx-mac80211/Makefile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'package/acx-mac80211/Makefile')

diff --git a/package/acx-mac80211/Makefile b/package/acx-mac80211/Makefile
index fb2216ff0d..c7f2c8819c 100644
--- a/package/acx-mac80211/Makefile
+++ b/package/acx-mac80211/Makefile
@@ -60,6 +60,12 @@ 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)))) \
 
+ifneq ($(CONFIG_LINUX_2_6_25)$(CONFIG_LINUX_2_6_30)$(CONFIG_LINUX_2_6_31)$(CONFIG_LINUX_2_6_32),)
+  LINUX_AUTOCONF_FILE:= linux/autoconf.h
+else
+  LINUX_AUTOCONF_FILE:= generated/autoconf.h
+endif
+
 define Build/Compile
 	$(MAKE) -C "$(LINUX_DIR)" \
 		ARCH="$(LINUX_KARCH)" \
@@ -69,7 +75,7 @@ define Build/Compile
 		EXTRA_CFLAGS="$(PKG_EXTRA_CFLAGS) -DCONFIG_ACX_MAC80211_VERSION=\"KERNEL_VERSION(2,6,34)\"" \
 		LINUXINCLUDE="-I$(STAGING_DIR)/usr/include/mac80211 -I$(LINUX_DIR)/include \
 			-Iarch/$(LINUX_KARCH)/include \
-			-include linux/autoconf.h" \
+			-include $(LINUX_AUTOCONF_FILE)" \
 		V="$(V)" \
 		modules
 endef
-- 
cgit v1.2.3