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/rtl8192su/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/rtl8192su/Makefile')
| -rw-r--r-- | drivers/staging/rtl8192su/Makefile | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/drivers/staging/rtl8192su/Makefile b/drivers/staging/rtl8192su/Makefile deleted file mode 100644 index 7133894..0000000 --- a/drivers/staging/rtl8192su/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -NIC_SELECT = RTL8192SU - -EXTRA_CFLAGS += -std=gnu89 -EXTRA_CFLAGS += -O2 - -EXTRA_CFLAGS += -DJACKSON_NEW_RX -EXTRA_CFLAGS += -DTHOMAS_BEACON - -#EXTRA_CFLAGS += -DMUTIPLE_BULK_OUT - -r8192s_usb-objs := \ - r8192U_wx.o \ - r8192S_phy.o \ - r8192S_rtl6052.o \ - r8192S_rtl8225.o \ - r819xU_cmdpkt.o \ - r8192U_dm.o \ - r8192SU_HWImg.o \ - r8192S_firmware.o \ - r8192S_Efuse.o \ - r8192U_core.o \ - r8192U_pm.o \ - r8192SU_led.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 \ - ieee80211/ieee80211_wx.o \ - ieee80211/ieee80211_module.o \ - ieee80211/ieee80211_softmac_wx.o\ - ieee80211/rtl819x_HTProc.o \ - ieee80211/rtl819x_TSProc.o \ - ieee80211/rtl819x_BAProc.o \ - ieee80211/dot11d.o - -obj-$(CONFIG_RTL8192SU) += r8192s_usb.o |
