diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /drivers/staging/rtl8192u/ieee80211/Makefile | |
parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
download | op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.zip op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.gz |
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8192u/ieee80211/Makefile')
-rw-r--r-- | drivers/staging/rtl8192u/ieee80211/Makefile | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/rtl8192u/ieee80211/Makefile b/drivers/staging/rtl8192u/ieee80211/Makefile index 71ca5d9..45704f8 100644 --- a/drivers/staging/rtl8192u/ieee80211/Makefile +++ b/drivers/staging/rtl8192u/ieee80211/Makefile @@ -5,22 +5,22 @@ MODDESTDIR := /lib/modules/$(KVER)/kernel/drivers/net/wireless/$(NIC_SELECT) CC = gcc ifneq ($(shell uname -r|cut -d. -f1,2), 2.4) -EXTRA_CFLAGS += -I$(TOPDIR)/drivers/net/wireless -EXTRA_CFLAGS += -O2 -EXTRA_CFLAGS += -DJACKSON_NEW_8187 -DJACKSON_NEW_RX +ccflags-y := -I$(TOPDIR)/drivers/net/wireless +ccflags-y += -O2 +ccflags-y += -DJACKSON_NEW_8187 -DJACKSON_NEW_RX #it will fail to compile in suse linux enterprise 10 sp2. This flag is to solve this problem. ifeq ($(shell uname -r | cut -d. -f1,2,3,4), 2.6.16.60-0) -EXTRA_CFLAGS += -DOPENSUSE_SLED +ccflags-y := -DOPENSUSE_SLED endif ifeq ($(NIC_SELECT),RTL8192U) -#EXTRA_CFLAGS += -DUSB_TX_DRIVER_AGGREGATION_ENABLE -#EXTRA_CFLAGS += -DUSB_RX_AGGREGATION_SUPPORT +#ccflags-y := -DUSB_TX_DRIVER_AGGREGATION_ENABLE +#ccflags-y := -DUSB_RX_AGGREGATION_SUPPORT endif -#EXTRA_CFLAGS += -DJOHN_NOCPY +#ccflags-y := -DJOHN_NOCPY #flags to enable or disble 80211D feature -EXTRA_CFLAGS += -DENABLE_DOT11D +ccflags-y += -DENABLE_DOT11D ieee80211-rsl-objs := ieee80211_rx.o \ ieee80211_softmac.o \ ieee80211_tx.o \ |