aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2007-08-30 16:41:16 +0000
committerNicolas Thill <nico@openwrt.org>2007-08-30 16:41:16 +0000
commit655027891294c054d43d554788f01c40f742ab11 (patch)
tree652f292b94cedb967977bef27cdf5c983caae426
parent297cf0cb90538e2fdc2da388791d6f37a2ed7c6b (diff)
downloadupstream-655027891294c054d43d554788f01c40f742ab11.tar.gz
upstream-655027891294c054d43d554788f01c40f742ab11.tar.bz2
upstream-655027891294c054d43d554788f01c40f742ab11.zip
rt2x00 fixes after [8548]: * fix creating defines from kconfig * revert auto-inclusion of rt2x00_compat.h
SVN-Revision: 8551
-rw-r--r--package/rt2x00/Makefile4
-rw-r--r--package/rt2x00/src/Makefile1
2 files changed, 3 insertions, 2 deletions
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