Commit c90e798c authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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

Merge branch 'wilc1000-move-out-of-staging' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next

 into staging-next

This is the movement of the wilc1000 driver out of staging, pulled in
here so that we do not end up doing duplicate work.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>

* 'wilc1000-move-out-of-staging' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next:
  wilc1000: move wilc driver out of staging
parents efa30b82 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








@@ -16266,13 +16273,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
































































CRA Git | Maintained and supported by SUSTech CRA and CCSE