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/rtl8187se/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/rtl8187se/Makefile')
-rw-r--r-- | drivers/staging/rtl8187se/Makefile | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/rtl8187se/Makefile b/drivers/staging/rtl8187se/Makefile index e6adf91..11a9226 100644 --- a/drivers/staging/rtl8187se/Makefile +++ b/drivers/staging/rtl8187se/Makefile @@ -4,19 +4,19 @@ #EXTRA_CFLAGS += -O2 #CC = gcc -EXTRA_CFLAGS += -DSW_ANTE -EXTRA_CFLAGS += -DTX_TRACK -EXTRA_CFLAGS += -DHIGH_POWER -EXTRA_CFLAGS += -DSW_DIG -EXTRA_CFLAGS += -DRATE_ADAPT +ccflags-y := -DSW_ANTE +ccflags-y += -DTX_TRACK +ccflags-y += -DHIGH_POWER +ccflags-y += -DSW_DIG +ccflags-y += -DRATE_ADAPT #enable it for legacy power save, disable it for leisure power save -EXTRA_CFLAGS += -DENABLE_LPS +ccflags-y += -DENABLE_LPS -#EXTRA_CFLAGS += -mhard-float -DCONFIG_FORCE_HARD_FLOAT=y +#ccflags-y := -mhard-float -DCONFIG_FORCE_HARD_FLOAT=y -r8187se-objs := \ +r8187se-y := \ r8180_core.o \ r8180_wx.o \ r8180_rtl8225z2.o \ |