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/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/Makefile')
-rw-r--r-- | drivers/staging/rtl8192u/Makefile | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/staging/rtl8192u/Makefile b/drivers/staging/rtl8192u/Makefile index 738f4a8..206d924 100644 --- a/drivers/staging/rtl8192u/Makefile +++ b/drivers/staging/rtl8192u/Makefile @@ -1,18 +1,18 @@ NIC_SELECT = RTL8192U -EXTRA_CFLAGS += -std=gnu89 -EXTRA_CFLAGS += -O2 +ccflags-y := -std=gnu89 +ccflags-y += -O2 -EXTRA_CFLAGS += -DCONFIG_FORCE_HARD_FLOAT=y -EXTRA_CFLAGS += -DJACKSON_NEW_8187 -DJACKSON_NEW_RX -EXTRA_CFLAGS += -DTHOMAS_BEACON -DTHOMAS_TASKLET -DTHOMAS_SKB -DTHOMAS_TURBO -#EXTRA_CFLAGS += -DUSB_TX_DRIVER_AGGREGATION_ENABLE -#EXTRA_CFLAGS += -DUSB_RX_AGGREGATION_SUPPORT -EXTRA_CFLAGS += -DUSE_ONE_PIPE -EXTRA_CFLAGS += -DENABLE_DOT11D -EXTRA_CFLAGS += -Idrivers/staging/rtl8192u/ieee80211 +ccflags-y += -DCONFIG_FORCE_HARD_FLOAT=y +ccflags-y += -DJACKSON_NEW_8187 -DJACKSON_NEW_RX +ccflags-y += -DTHOMAS_BEACON -DTHOMAS_TASKLET -DTHOMAS_SKB -DTHOMAS_TURBO +#ccflags-y += -DUSB_TX_DRIVER_AGGREGATION_ENABLE +#ccflags-y += -DUSB_RX_AGGREGATION_SUPPORT +ccflags-y += -DUSE_ONE_PIPE +ccflags-y += -DENABLE_DOT11D +ccflags-y += -Idrivers/staging/rtl8192u/ieee80211 -r8192u_usb-objs := r8192U_core.o r8180_93cx6.o r8192U_wx.o \ +r8192u_usb-y := r8192U_core.o r8180_93cx6.o r8192U_wx.o \ r8190_rtl8256.o r819xU_phy.o r819xU_firmware.o \ r819xU_cmdpkt.o r8192U_dm.o r819xU_firmware_img.o \ ieee80211/ieee80211_crypt.o \ |