Merge tag 'lsk-android-14.05' into develop-3.10

[firefly-linux-kernel-4.4.55.git] / drivers / net / wireless / Makefile

diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
old mode 100755 (executable)
new mode 100644 (file)
index 64d1d3e..721973f
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -1,18 +1,15 @@
 #
 # Makefile for the Linux Wireless network device drivers.
 #
-obj-y += wifi_sys/rkwifi_sys_iface.o
-obj-$(CONFIG_BCM4329)   += bcm4329/
-obj-$(CONFIG_MV8686)   += mv8686/
-obj-$(CONFIG_BCM4319)   += bcm4319/
-obj-$(CONFIG_RTL8192CU) += rkusbwifi/
-obj-$(CONFIG_RTL8188EU)        += rkusbwifi/
-obj-$(CONFIG_RTL8723AU)        += rkusbwifi/
-obj-$(CONFIG_RT5370)   += rkusbwifi/
-obj-$(CONFIG_AR6003)   += ar6003/
-obj-$(CONFIG_RKWIFI)   += rkwifi/
-obj-$(CONFIG_RDA5990) += rda5990/
-obj-$(CONFIG_MT5931)  += mt5931/
-obj-$(CONFIG_MT5931_MT6622)  += mt5931/
-obj-$(CONFIG_RTL8723AS) += rtl8723as/
-#obj-m += wlan/
+obj-y += rockchip_wlan/wifi_sys/rkwifi_sys_iface.o
+obj-$(CONFIG_RTL8192CU)        += rockchip_wlan/rtl8192cu/
+obj-$(CONFIG_RTL8192DU)        += rockchip_wlan/rtl8192du/
+obj-$(CONFIG_RTL8188EU)               += rockchip_wlan/rtl8188eu/
+obj-$(CONFIG_RTL8723AU)               += rockchip_wlan/rtl8723au/
+obj-$(CONFIG_RKWIFI)           += rockchip_wlan/rkwifi/
+obj-$(CONFIG_RDA5990)          += rockchip_wlan/rda5990/
+obj-$(CONFIG_MT5931)           += rockchip_wlan/mt5931/
+obj-$(CONFIG_MT5931_MT6622)    += rockchip_wlan/mt5931/
+obj-$(CONFIG_RTL8723BS)        += rockchip_wlan/rtl8723bs/
+obj-$(CONFIG_MTK_COMBO_WIFI)   += rockchip_wlan/combo_mt66xx/
+obj-$(CONFIG_MTK_MT5931)       += rockchip_wlan/mt5931_kk/