85 lines
2.3 KiB
Diff
85 lines
2.3 KiB
Diff
|
From 236c1acdfef5958010ac9814a9872e0a46fd78ee Mon Sep 17 00:00:00 2001
|
||
|
|
From: John Crispin <john@phrozen.org>
|
||
|
|
Date: Fri, 7 Jul 2017 17:13:44 +0200
|
||
|
|
Subject: 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(-)
|
||
|
|
|
||
|
|
--- 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
|
||
|
|
--- 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),)
|
||
|
|
--- 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
|
||
|
|
--- 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
|