Commit f555abfe authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge branch 'wilc1000-move-out-of-staging' 

This is an immutable branch shared between wireless-drivers-next and
staging-next for moving wilc1000 driver out of staging to drivers/net/wireless
directory.
parents a15a20ac 5625f965

MAINTAINERS

+7 −7
Original line number Diff line number Diff line
@@ -11362,6 +11362,13 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 
S:	Supported

F:	drivers/usb/gadget/udc/atmel_usba_udc.*









MICROCHIP WILC1000 WIFI DRIVER









M:	Adham Abozaeid <adham.abozaeid@microchip.com>









M:	Ajay Singh <ajay.kathat@microchip.com>









L:	linux-wireless@vger.kernel.org









S:	Supported









F:	drivers/net/wireless/microchip/wilc1000/

















MICROCHIP XDMA DRIVER









M:	Ludovic Desroches <ludovic.desroches@microchip.com>









L:	linux-arm-kernel@lists.infradead.org








@@ -16251,13 +16258,6 @@ M:	Forest Bond <forest@alittletooquiet.net>







S:	Odd Fixes









F:	drivers/staging/vt665?/

















STAGING - WILC1000 WIFI DRIVER









M:	Adham Abozaeid <adham.abozaeid@microchip.com>









M:	Ajay Singh <ajay.kathat@microchip.com>









L:	linux-wireless@vger.kernel.org









S:	Supported









F:	drivers/staging/wilc1000/

















STAGING SUBSYSTEM









M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>









L:	devel@driverdev.osuosl.org
































drivers/net/wireless/Kconfig



+1
−0






























Original line number
Diff line number
Diff line







@@ -40,6 +40,7 @@ source "drivers/net/wireless/intel/Kconfig"







source "drivers/net/wireless/intersil/Kconfig"









source "drivers/net/wireless/marvell/Kconfig"









source "drivers/net/wireless/mediatek/Kconfig"









source "drivers/net/wireless/microchip/Kconfig"









source "drivers/net/wireless/ralink/Kconfig"









source "drivers/net/wireless/realtek/Kconfig"









source "drivers/net/wireless/rsi/Kconfig"
































drivers/net/wireless/Makefile



+1
−0






























Original line number
Diff line number
Diff line







@@ -12,6 +12,7 @@ obj-$(CONFIG_WLAN_VENDOR_INTEL) += intel/







obj-$(CONFIG_WLAN_VENDOR_INTERSIL) += intersil/









obj-$(CONFIG_WLAN_VENDOR_MARVELL) += marvell/









obj-$(CONFIG_WLAN_VENDOR_MEDIATEK) += mediatek/









obj-$(CONFIG_WLAN_VENDOR_MICROCHIP) += microchip/









obj-$(CONFIG_WLAN_VENDOR_RALINK) += ralink/









obj-$(CONFIG_WLAN_VENDOR_REALTEK) += realtek/









obj-$(CONFIG_WLAN_VENDOR_RSI) += rsi/
































drivers/net/wireless/microchip/Kconfig
0 → 100644



+15
−0






























Original line number
Diff line number
Diff line









# SPDX-License-Identifier: GPL-2.0









config WLAN_VENDOR_MICROCHIP









	bool "Microchip devices"









	default y









	help









	If you have a wireless card belonging to this class, say Y.



















	Note that the answer to this question doesn't directly affect the









	kernel: saying N will just cause the configurator to skip all the









	questions about these cards. If you say Y, you will be asked for









	your specific card in the following questions.



















if WLAN_VENDOR_MICROCHIP









source "drivers/net/wireless/microchip/wilc1000/Kconfig"









endif # WLAN_VENDOR_MICROCHIP