mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 19:07:52 +00:00
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: Greg 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
This commit is contained in:
commit
c90e798c66
25 changed files with 26 additions and 10 deletions
14
MAINTAINERS
14
MAINTAINERS
|
@ -11362,6 +11362,13 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
|
||||||
S: Supported
|
S: Supported
|
||||||
F: drivers/usb/gadget/udc/atmel_usba_udc.*
|
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
|
MICROCHIP XDMA DRIVER
|
||||||
M: Ludovic Desroches <ludovic.desroches@microchip.com>
|
M: Ludovic Desroches <ludovic.desroches@microchip.com>
|
||||||
L: linux-arm-kernel@lists.infradead.org
|
L: linux-arm-kernel@lists.infradead.org
|
||||||
|
@ -16266,13 +16273,6 @@ M: Forest Bond <forest@alittletooquiet.net>
|
||||||
S: Odd Fixes
|
S: Odd Fixes
|
||||||
F: drivers/staging/vt665?/
|
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
|
STAGING SUBSYSTEM
|
||||||
M: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
M: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||||
L: devel@driverdev.osuosl.org
|
L: devel@driverdev.osuosl.org
|
||||||
|
|
|
@ -40,6 +40,7 @@ source "drivers/net/wireless/intel/Kconfig"
|
||||||
source "drivers/net/wireless/intersil/Kconfig"
|
source "drivers/net/wireless/intersil/Kconfig"
|
||||||
source "drivers/net/wireless/marvell/Kconfig"
|
source "drivers/net/wireless/marvell/Kconfig"
|
||||||
source "drivers/net/wireless/mediatek/Kconfig"
|
source "drivers/net/wireless/mediatek/Kconfig"
|
||||||
|
source "drivers/net/wireless/microchip/Kconfig"
|
||||||
source "drivers/net/wireless/ralink/Kconfig"
|
source "drivers/net/wireless/ralink/Kconfig"
|
||||||
source "drivers/net/wireless/realtek/Kconfig"
|
source "drivers/net/wireless/realtek/Kconfig"
|
||||||
source "drivers/net/wireless/rsi/Kconfig"
|
source "drivers/net/wireless/rsi/Kconfig"
|
||||||
|
|
|
@ -12,6 +12,7 @@ obj-$(CONFIG_WLAN_VENDOR_INTEL) += intel/
|
||||||
obj-$(CONFIG_WLAN_VENDOR_INTERSIL) += intersil/
|
obj-$(CONFIG_WLAN_VENDOR_INTERSIL) += intersil/
|
||||||
obj-$(CONFIG_WLAN_VENDOR_MARVELL) += marvell/
|
obj-$(CONFIG_WLAN_VENDOR_MARVELL) += marvell/
|
||||||
obj-$(CONFIG_WLAN_VENDOR_MEDIATEK) += mediatek/
|
obj-$(CONFIG_WLAN_VENDOR_MEDIATEK) += mediatek/
|
||||||
|
obj-$(CONFIG_WLAN_VENDOR_MICROCHIP) += microchip/
|
||||||
obj-$(CONFIG_WLAN_VENDOR_RALINK) += ralink/
|
obj-$(CONFIG_WLAN_VENDOR_RALINK) += ralink/
|
||||||
obj-$(CONFIG_WLAN_VENDOR_REALTEK) += realtek/
|
obj-$(CONFIG_WLAN_VENDOR_REALTEK) += realtek/
|
||||||
obj-$(CONFIG_WLAN_VENDOR_RSI) += rsi/
|
obj-$(CONFIG_WLAN_VENDOR_RSI) += rsi/
|
||||||
|
|
15
drivers/net/wireless/microchip/Kconfig
Normal file
15
drivers/net/wireless/microchip/Kconfig
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
# 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
|
2
drivers/net/wireless/microchip/Makefile
Normal file
2
drivers/net/wireless/microchip/Makefile
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
# SPDX-License-Identifier: GPL-2.0
|
||||||
|
obj-$(CONFIG_WILC1000) += wilc1000/
|
|
@ -84,8 +84,6 @@ source "drivers/staging/fbtft/Kconfig"
|
||||||
|
|
||||||
source "drivers/staging/fsl-dpaa2/Kconfig"
|
source "drivers/staging/fsl-dpaa2/Kconfig"
|
||||||
|
|
||||||
source "drivers/staging/wilc1000/Kconfig"
|
|
||||||
|
|
||||||
source "drivers/staging/most/Kconfig"
|
source "drivers/staging/most/Kconfig"
|
||||||
|
|
||||||
source "drivers/staging/ks7010/Kconfig"
|
source "drivers/staging/ks7010/Kconfig"
|
||||||
|
|
|
@ -32,7 +32,6 @@ obj-$(CONFIG_UNISYSSPAR) += unisys/
|
||||||
obj-$(CONFIG_COMMON_CLK_XLNX_CLKWZRD) += clocking-wizard/
|
obj-$(CONFIG_COMMON_CLK_XLNX_CLKWZRD) += clocking-wizard/
|
||||||
obj-$(CONFIG_FB_TFT) += fbtft/
|
obj-$(CONFIG_FB_TFT) += fbtft/
|
||||||
obj-$(CONFIG_FSL_DPAA2) += fsl-dpaa2/
|
obj-$(CONFIG_FSL_DPAA2) += fsl-dpaa2/
|
||||||
obj-$(CONFIG_WILC1000) += wilc1000/
|
|
||||||
obj-$(CONFIG_MOST) += most/
|
obj-$(CONFIG_MOST) += most/
|
||||||
obj-$(CONFIG_KS7010) += ks7010/
|
obj-$(CONFIG_KS7010) += ks7010/
|
||||||
obj-$(CONFIG_GREYBUS) += greybus/
|
obj-$(CONFIG_GREYBUS) += greybus/
|
||||||
|
|
Loading…
Reference in a new issue