tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

mediatek: unify Kconfig with other vendors

Part of reorganising wireless drivers directory and Kconfig.

Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

Kalle Valo 7b09ed5a 33aca94d

+12 -9
+1 -1
drivers/net/wireless/Kconfig
··· 24 24 source "drivers/net/wireless/intel/Kconfig" 25 25 source "drivers/net/wireless/intersil/Kconfig" 26 26 source "drivers/net/wireless/marvell/Kconfig" 27 + source "drivers/net/wireless/mediatek/Kconfig" 27 28 source "drivers/net/wireless/ralink/Kconfig" 28 29 source "drivers/net/wireless/realtek/Kconfig" 29 30 source "drivers/net/wireless/rsi/Kconfig" ··· 99 98 called mac80211_hwsim. If unsure, say N. 100 99 101 100 source "drivers/net/wireless/ath/Kconfig" 102 - source "drivers/net/wireless/mediatek/Kconfig" 103 101 source "drivers/net/wireless/ti/Kconfig" 104 102 105 103 endif # WLAN
+1 -2
drivers/net/wireless/Makefile
··· 9 9 obj-$(CONFIG_WLAN_VENDOR_INTEL) += intel/ 10 10 obj-$(CONFIG_WLAN_VENDOR_INTERSIL) += intersil/ 11 11 obj-$(CONFIG_WLAN_VENDOR_MARVELL) += marvell/ 12 + obj-$(CONFIG_WLAN_VENDOR_MEDIATEK) += mediatek/ 12 13 obj-$(CONFIG_WLAN_VENDOR_RALINK) += ralink/ 13 14 obj-$(CONFIG_WLAN_VENDOR_REALTEK) += realtek/ 14 15 obj-$(CONFIG_WLAN_VENDOR_RSI) += rsi/ ··· 21 20 obj-$(CONFIG_PCMCIA_WL3501) += wl3501_cs.o 22 21 23 22 obj-$(CONFIG_USB_NET_RNDIS_WLAN) += rndis_wlan.o 24 - 25 - obj-$(CONFIG_WL_MEDIATEK) += mediatek/ 26 23 27 24 obj-$(CONFIG_ATH_CARDS) += ath/ 28 25
+10 -6
drivers/net/wireless/mediatek/Kconfig
··· 1 - menuconfig WL_MEDIATEK 2 - bool "Mediatek Wireless LAN support" 1 + config WLAN_VENDOR_MEDIATEK 2 + bool "MediaTek devices" 3 + default y 3 4 ---help--- 4 - Enable community drivers for MediaTek WiFi devices. 5 - Those drivers make use of the Linux mac80211 stack. 5 + If you have a wireless card belonging to this class, say Y. 6 6 7 + Note that the answer to this question doesn't directly affect the 8 + kernel: saying N will just cause the configurator to skip all 9 + the questions about cards. If you say Y, you will be asked for 10 + your specific card in the following questions. 7 11 8 - if WL_MEDIATEK 12 + if WLAN_VENDOR_MEDIATEK 9 13 source "drivers/net/wireless/mediatek/mt7601u/Kconfig" 10 - endif # WL_MEDIATEK 14 + endif # WLAN_VENDOR_MEDIATEK