From: Nicolas Thill <nico@openwrt.org>
Date: Thu, 30 Aug 2007 16:41:16 +0000 (+0000)
Subject: rt2x00 fixes after [8548]: * fix creating defines from kconfig * revert auto-inclusio... 
X-Git-Tag: reboot~28263
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=655027891294c054d43d554788f01c40f742ab11;p=openwrt%2Fstaging%2Flynxis.git

rt2x00 fixes after [8548]: * fix creating defines from kconfig * revert auto-inclusion of rt2x00_compat.h

SVN-Revision: 8551
---

diff --git a/package/rt2x00/Makefile b/package/rt2x00/Makefile
index e7e4b57e4e..fe1ee64eff 100644
--- a/package/rt2x00/Makefile
+++ b/package/rt2x00/Makefile
@@ -130,8 +130,8 @@ ifndef ($(CONFIG_MAC80211),)
 
   PKG_EXTRA_CFLAGS:= \
 	-I$(STAGING_DIR)/usr/include/mac80211 \
-	$(patsubst CONFIG_%, -DCONFIG_%=1, $(filter %=m,$(PKG_EXTRA_KCONFIG))) \
-	$(patsubst CONFIG_%, -DCONFIG_%=1, $(filter %=y,$(PKG_EXTRA_KCONFIG))) \
+	$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=m,%,$(filter %=m,$(PKG_EXTRA_KCONFIG)))) \
+	$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=y,%,$(filter %=y,$(PKG_EXTRA_KCONFIG)))) \
 
   define Build/Compile/it
 	$(MAKE) -C "$(LINUX_DIR)" \
diff --git a/package/rt2x00/src/Makefile b/package/rt2x00/src/Makefile
index dd32cf6a20..842afbac20 100644
--- a/package/rt2x00/src/Makefile
+++ b/package/rt2x00/src/Makefile
@@ -97,6 +97,7 @@ endif
 endif
 
 MAKEFLAGS += --no-print-directory
+CFLAGS := -include $(SUBDIRS)/rt2x00_compat.h $(CFLAGS)
 
 all: default