rt2x00 fixes after [8548]:

 * fix creating defines from kconfig
 * revert auto-inclusion of rt2x00_compat.h

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8551 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/rt2x00/Makefile b/package/rt2x00/Makefile
index e7e4b57..fe1ee64 100644 (file)
--- 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 dd32cf6..842afba 100644 (file)
--- 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