From bde100671ff5611c8381d6202c807512cc6c2181 Mon Sep 17 00:00:00 2001 From: Oskar Viljasaar <oskar.viljasaar@iopsys.eu> Date: Tue, 19 Jan 2021 10:47:05 +0100 Subject: [PATCH] Import openwrt hack patch 280-rfkill-stubs.patch --- include/linux/rfkill.h | 2 +- net/Makefile | 2 +- net/rfkill/Kconfig | 12 ++++++++---- net/rfkill/Makefile | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/include/linux/rfkill.h b/include/linux/rfkill.h index 8ad2487a86..836433edad 100644 --- a/include/linux/rfkill.h +++ b/include/linux/rfkill.h @@ -64,7 +64,7 @@ struct rfkill_ops { int (*set_block)(void *data, bool blocked); }; -#if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE) +#if defined(CONFIG_RFKILL_FULL) || defined(CONFIG_RFKILL_FULL_MODULE) /** * rfkill_alloc - Allocate rfkill structure * @name: name of the struct -- the string is not copied internally diff --git a/net/Makefile b/net/Makefile index bdaf53925a..e75a7c9953 100644 --- a/net/Makefile +++ b/net/Makefile @@ -53,7 +53,7 @@ obj-$(CONFIG_TIPC) += tipc/ obj-$(CONFIG_NETLABEL) += netlabel/ obj-$(CONFIG_IUCV) += iucv/ obj-$(CONFIG_SMC) += smc/ -obj-$(CONFIG_RFKILL) += rfkill/ +obj-$(CONFIG_RFKILL_FULL) += rfkill/ obj-$(CONFIG_NET_9P) += 9p/ obj-$(CONFIG_CAIF) += caif/ ifneq ($(CONFIG_DCB),) diff --git a/net/rfkill/Kconfig b/net/rfkill/Kconfig index 060600b03f..76f0537a40 100644 --- a/net/rfkill/Kconfig +++ b/net/rfkill/Kconfig @@ -1,7 +1,11 @@ # # RF switch subsystem configuration # -menuconfig RFKILL +config RFKILL + bool + default y + +menuconfig RFKILL_FULL tristate "RF switch subsystem support" help Say Y here if you want to have control over RF switches @@ -13,19 +17,19 @@ menuconfig RFKILL # LED trigger support config RFKILL_LEDS bool - depends on RFKILL + depends on RFKILL_FULL depends on LEDS_TRIGGERS = y || RFKILL = LEDS_TRIGGERS default y config RFKILL_INPUT bool "RF switch input support" if EXPERT - depends on RFKILL + depends on RFKILL_FULL depends on INPUT = y || RFKILL = INPUT default y if !EXPERT config RFKILL_GPIO tristate "GPIO RFKILL driver" - depends on RFKILL + depends on RFKILL_FULL depends on GPIOLIB || COMPILE_TEST default n help diff --git a/net/rfkill/Makefile b/net/rfkill/Makefile index 87a80aded0..a66f9b077e 100644 --- a/net/rfkill/Makefile +++ b/net/rfkill/Makefile @@ -4,5 +4,5 @@ rfkill-y += core.o rfkill-$(CONFIG_RFKILL_INPUT) += input.o -obj-$(CONFIG_RFKILL) += rfkill.o +obj-$(CONFIG_RFKILL_FULL) += rfkill.o obj-$(CONFIG_RFKILL_GPIO) += rfkill-gpio.o -- GitLab