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 88f1450..721973f
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -1,16 +1,15 @@
 #
 # Makefile for the Linux Wireless network device drivers.
 #
-obj-y += wifi_sys/rkwifi_sys_iface.o
-obj-$(CONFIG_RTL8192CU) += rtl8192cu/
-obj-$(CONFIG_RTL8192DU) += rtl8192du/
-obj-$(CONFIG_RTL8188EU)        += rtl8188eu/
-obj-$(CONFIG_RTL8723AU)        += rtl8723au/
-obj-$(CONFIG_RKWIFI)   += rkwifi/
-obj-$(CONFIG_RDA5990) += rda5990/
-obj-$(CONFIG_MT5931)  += mt5931/
-obj-$(CONFIG_MT5931_MT6622)  += mt5931/
-obj-$(CONFIG_RTL8723BS) += rtl8723bs/
-#obj-$(CONFIG_MT7601)  += mt7601/
-obj-$(CONFIG_MTK_COMBO_WIFI)   += combo_mt66xx/
-obj-$(CONFIG_MTK_MT5931)       += mt5931_kk/
+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/