From fe85541a42e0fbf33ead08f8e86e3bfe487f252c Mon Sep 17 00:00:00 2001 From: John Crispin <john@phrozen.org> Date: Fri, 7 Jul 2017 17:13:44 +0200 Subject: [PATCH] rfkill: add fake rfkill support allow building of modules depending on RFKILL even if RFKILL is not enabled. Signed-off-by: John Crispin <john@phrozen.org> --- include/linux/rfkill.h | 2 +- net/Makefile | 2 +- net/rfkill/Kconfig | 14 +++++++++----- net/rfkill/Makefile | 2 +- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/include/linux/rfkill.h b/include/linux/rfkill.h index e6a0031d1..ed5f744f0 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 IS_ENABLED(CONFIG_RFKILL_FULL) /** * 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 be46f0407..5034cc793 100644 --- a/net/Makefile +++ b/net/Makefile @@ -52,7 +52,7 @@ obj-$(CONFIG_MAC80211) += mac80211/ obj-$(CONFIG_TIPC) += tipc/ obj-$(CONFIG_NETLABEL) += netlabel/ obj-$(CONFIG_IUCV) += iucv/ -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 868f1ad04..159b6ebea 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_REGULATOR tristate "Generic rfkill regulator driver" - depends on RFKILL || !RFKILL + depends on RFKILL_FULL || !RFKILL_FULL depends on REGULATOR help This options enable controlling radio transmitters connected to @@ -36,7 +40,7 @@ config RFKILL_REGULATOR 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 311768783..dbb01a864 100644 --- a/net/rfkill/Makefile +++ b/net/rfkill/Makefile @@ -4,6 +4,6 @@ rfkill-y += core.o rfkill-$(CONFIG_RFKILL_INPUT) += input.o -obj-$(CONFIG_RFKILL) += rfkill.o +obj-$(CONFIG_RFKILL_FULL) += rfkill.o obj-$(CONFIG_RFKILL_REGULATOR) += rfkill-regulator.o obj-$(CONFIG_RFKILL_GPIO) += rfkill-gpio.o -- GitLab