diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 19:54:53 (GMT) |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 20:01:40 (GMT) |
commit | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (patch) | |
tree | 3c2086ab67398a019089a47ca3f362a4bc6db74f /drivers/staging/rtl8192su/Makefile | |
parent | 34e84f39a27d059a3e6ec6e8b94aafa702e6f220 (diff) | |
parent | 9173a8ef24a6b1b8031507b35b8ffe5f85a87692 (diff) | |
download | linux-fsl-qoriq-ae19ffbadc1b2100285a5b5b3d0a4e0a11390904.tar.xz |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/staging/rtl8192su/Makefile')
-rw-r--r-- | drivers/staging/rtl8192su/Makefile | 39 |
1 files changed, 6 insertions, 33 deletions
diff --git a/drivers/staging/rtl8192su/Makefile b/drivers/staging/rtl8192su/Makefile index f010ab5..c8b4332 100644 --- a/drivers/staging/rtl8192su/Makefile +++ b/drivers/staging/rtl8192su/Makefile @@ -2,33 +2,11 @@ NIC_SELECT = RTL8192SU EXTRA_CFLAGS += -std=gnu89 EXTRA_CFLAGS += -O2 -EXTRA_CFLAGS += -mhard-float -DCONFIG_FORCE_HARD_FLOAT=y EXTRA_CFLAGS += -DJACKSON_NEW_RX -EXTRA_CFLAGS += -DTHOMAS_BEACON -DTHOMAS_TURBO -#EXTRA_CFLAGS += -DUSE_ONE_PIPE -EXTRA_CFLAGS += -DENABLE_DOT11D - -EXTRA_CFLAGS += -DRTL8192SU -EXTRA_CFLAGS += -DRTL8190_Download_Firmware_From_Header=1 -EXTRA_CFLAGS += -DRTL8192S_PREPARE_FOR_NORMAL_RELEASE -EXTRA_CFLAGS += -DRTL8192SU_DISABLE_IQK=1 - -#EXTRA_CFLAGS += -DEEPROM_OLD_FORMAT_SUPPORT - -#EXTRA_CFLAGS += -DUSB_RX_AGGREGATION_SUPPORT=0 -#EXTRA_CFLAGS += -DUSB_TX_DRIVER_AGGREGATION_ENABLE=0 -#EXTRA_CFLAGS += -DRTL8192SU_DISABLE_CCK_RATE=0 -EXTRA_CFLAGS += -DRTL8192S_DISABLE_FW_DM=0 -EXTRA_CFLAGS += -DDISABLE_BB_RF=0 -EXTRA_CFLAGS += -DRTL8192SU_USE_PARAM_TXPWR=0 -EXTRA_CFLAGS += -DRTL8192SU_FPGA_UNSPECIFIED_NETWORK=0 -#EXTRA_CFLAGS += -DRTL8192SU_FPGA_2MAC_VERIFICATION #=0 -EXTRA_CFLAGS += -DRTL8192SU_ASIC_VERIFICATION -EXTRA_CFLAGS += -DRTL8192SU_USB_PHY_TEST=0 +EXTRA_CFLAGS += -DTHOMAS_BEACON #EXTRA_CFLAGS += -DMUTIPLE_BULK_OUT -EXTRA_CFLAGS += -DCONFIG_RTL8192_PM r8192s_usb-objs := \ r8180_93cx6.o \ @@ -42,9 +20,11 @@ r8192s_usb-objs := \ r8192S_firmware.o \ r8192S_Efuse.o \ r8192U_core.o \ - r8192U_pm.o - -ieee80211-rsl-objs := \ + r8192U_pm.o \ + ieee80211/ieee80211_crypt.o \ + ieee80211/ieee80211_crypt_tkip.o \ + ieee80211/ieee80211_crypt_ccmp.o \ + ieee80211/ieee80211_crypt_wep.o \ ieee80211/ieee80211_rx.o \ ieee80211/ieee80211_softmac.o \ ieee80211/ieee80211_tx.o \ @@ -57,10 +37,3 @@ ieee80211-rsl-objs := \ ieee80211/dot11d.o obj-$(CONFIG_RTL8192SU) += r8192s_usb.o -obj-$(CONFIG_RTL8192SU) += ieee80211-rsl.o -obj-$(CONFIG_RTL8192SU) += ieee80211/ieee80211_crypt.o -obj-$(CONFIG_RTL8192SU) += ieee80211/ieee80211_crypt_tkip.o -obj-$(CONFIG_RTL8192SU) += ieee80211/ieee80211_crypt_ccmp.o -obj-$(CONFIG_RTL8192SU) += ieee80211/ieee80211_crypt_wep.o - - |