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

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

Merge branch 'wfx-move-out-of-staging' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next into staging-next

This moves the wfx driver out of staging.

* 'wfx-move-out-of-staging' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next:
  wfx: get out from the staging area
parents 7288ff56 4a5fb1bb

Documentation/devicetree/bindings/staging/net/wireless/silabs,wfx.yaml→Documentation/devicetree/bindings/net/wireless/silabs,wfx.yaml

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
%YAML 1.2

---



$id: http://devicetree.org/schemas/staging/net/wireless/silabs,wfx.yaml#

$id: http://devicetree.org/schemas/net/wireless/silabs,wfx.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Silicon Labs WFxxx devicetree bindings

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -17982,8 +17982,8 @@ F: drivers/platform/x86/touchscreen_dmi.c 
SILICON LABS WIRELESS DRIVERS (for WFxxx series)

M:	Jérôme Pouiller <jerome.pouiller@silabs.com>

S:	Supported

F:	Documentation/devicetree/bindings/staging/net/wireless/silabs,wfx.yaml

F:	drivers/staging/wfx/

F:	Documentation/devicetree/bindings/net/wireless/silabs,wfx.yaml

F:	drivers/net/wireless/silabs/wfx/









SILICON MOTION SM712 FRAME BUFFER DRIVER









M:	Sudip Mukherjee <sudipm.mukherjee@gmail.com>

























drivers/net/wireless/Kconfig



+1
−0






























Original line number
Diff line number
Diff line







@@ -31,6 +31,7 @@ source "drivers/net/wireless/microchip/Kconfig"







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









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









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









source "drivers/net/wireless/silabs/Kconfig"









source "drivers/net/wireless/st/Kconfig"









source "drivers/net/wireless/ti/Kconfig"









source "drivers/net/wireless/zydas/Kconfig"
































drivers/net/wireless/Makefile



+1
−0






























Original line number
Diff line number
Diff line







@@ -16,6 +16,7 @@ obj-$(CONFIG_WLAN_VENDOR_MICROCHIP) += microchip/







obj-$(CONFIG_WLAN_VENDOR_RALINK) += ralink/









obj-$(CONFIG_WLAN_VENDOR_REALTEK) += realtek/









obj-$(CONFIG_WLAN_VENDOR_RSI) += rsi/









obj-$(CONFIG_WLAN_VENDOR_SILABS) += silabs/









obj-$(CONFIG_WLAN_VENDOR_ST) += st/









obj-$(CONFIG_WLAN_VENDOR_TI) += ti/









obj-$(CONFIG_WLAN_VENDOR_ZYDAS) += zydas/
































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



+18
−0






























Original line number
Diff line number
Diff line









# SPDX-License-Identifier: GPL-2.0



















config WLAN_VENDOR_SILABS









	bool "Silicon Laboratories 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_SILABS



















source "drivers/net/wireless/silabs/wfx/Kconfig"



















endif # WLAN_VENDOR_SILABS