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
commit39c62b54db169f4c2212dc0068198155dc10dcb8 (patch)
treec8993398ceb95efe9a10018701307eec3ed48950
parentcf9e2f568437d56b4075e24623a62201ae9b5a02 (diff)
downloadmaster-187ad058-39c62b54db169f4c2212dc0068198155dc10dcb8.tar.gz
master-187ad058-39c62b54db169f4c2212dc0068198155dc10dcb8.tar.bz2
master-187ad058-39c62b54db169f4c2212dc0068198155dc10dcb8.zip
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
-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