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/rtl8192e/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/rtl8192e/Makefile')
-rw-r--r-- | drivers/staging/rtl8192e/Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/rtl8192e/Makefile b/drivers/staging/rtl8192e/Makefile index 41cb4d3..6e41067 100644 --- a/drivers/staging/rtl8192e/Makefile +++ b/drivers/staging/rtl8192e/Makefile @@ -1,13 +1,13 @@ NIC_SELECT = RTL8192E -EXTRA_CFLAGS += -DRTL8192E -EXTRA_CFLAGS += -std=gnu89 -EXTRA_CFLAGS += -O2 -EXTRA_CFLAGS += -DTHOMAS_TURBO -EXTRA_CFLAGS += -DENABLE_DOT11D +ccflags-y := -DRTL8192E +ccflags-y += -std=gnu89 +ccflags-y += -O2 +ccflags-y += -DTHOMAS_TURBO +ccflags-y += -DENABLE_DOT11D -EXTRA_CFLAGS += -DENABLE_IPS -EXTRA_CFLAGS += -DENABLE_LPS +ccflags-y += -DENABLE_IPS +ccflags-y += -DENABLE_LPS r8192e_pci-objs := \ r8192E_core.o \ |