target/linux/generic/patches-4.4/280-rfkill-stubs.patch

   1 --- a/net/rfkill/Kconfig
   2 +++ b/net/rfkill/Kconfig
   3 @@ -1,7 +1,11 @@
   4  #
   5  # RF switch subsystem configuration
   6  #
   7 -menuconfig RFKILL
   8 +config RFKILL
   9 +       bool
  10 +       default y
  11 +
  12 +menuconfig RFKILL_FULL
  13         tristate "RF switch subsystem support"
  14         help
  15           Say Y here if you want to have control over RF switches
  16 @@ -13,19 +17,19 @@ menuconfig RFKILL
  17  # LED trigger support
  18  config RFKILL_LEDS
  19         bool
  20 -       depends on RFKILL
  21 +       depends on RFKILL_FULL
  22         depends on LEDS_TRIGGERS = y || RFKILL = LEDS_TRIGGERS
  23         default y
  24
  25  config RFKILL_INPUT
  26         bool "RF switch input support" if EXPERT
  27 -       depends on RFKILL
  28 +       depends on RFKILL_FULL
  29         depends on INPUT = y || RFKILL = INPUT
  30         default y if !EXPERT
  31
  32  config RFKILL_REGULATOR
  33         tristate "Generic rfkill regulator driver"
  34 -       depends on RFKILL || !RFKILL
  35 +       depends on RFKILL_FULL || !RFKILL_FULL
  36         depends on REGULATOR
  37         help
  38            This options enable controlling radio transmitters connected to
  39 @@ -36,7 +40,7 @@ config RFKILL_REGULATOR
  40
  41  config RFKILL_GPIO
  42         tristate "GPIO RFKILL driver"
  43 -       depends on RFKILL
  44 +       depends on RFKILL_FULL
  45         depends on GPIOLIB || COMPILE_TEST
  46         default n
  47         help
  48 --- a/net/rfkill/Makefile
  49 +++ b/net/rfkill/Makefile
  50 @@ -4,6 +4,6 @@
  51
  52  rfkill-y                       += core.o
  53  rfkill-$(CONFIG_RFKILL_INPUT)  += input.o
  54 -obj-$(CONFIG_RFKILL)           += rfkill.o
  55 +obj-$(CONFIG_RFKILL_FULL)      += rfkill.o
  56  obj-$(CONFIG_RFKILL_REGULATOR) += rfkill-regulator.o
  57  obj-$(CONFIG_RFKILL_GPIO)      += rfkill-gpio.o
  58 --- a/net/Makefile
  59 +++ b/net/Makefile
  60 @@ -49,7 +49,7 @@ obj-$(CONFIG_MAC80211)                += mac80211/
  61  obj-$(CONFIG_TIPC)             += tipc/
  62  obj-$(CONFIG_NETLABEL)         += netlabel/
  63  obj-$(CONFIG_IUCV)             += iucv/
  64 -obj-$(CONFIG_RFKILL)           += rfkill/
  65 +obj-$(CONFIG_RFKILL_FULL)      += rfkill/
  66  obj-$(CONFIG_NET_9P)           += 9p/
  67  obj-$(CONFIG_CAIF)             += caif/
  68  ifneq ($(CONFIG_DCB),)
  69 --- a/include/linux/rfkill.h
  70 +++ b/include/linux/rfkill.h
  71 @@ -64,7 +64,7 @@ struct rfkill_ops {
  72         int     (*set_block)(void *data, bool blocked);
  73  };
  74
  75 -#if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE)
  76 +#if defined(CONFIG_RFKILL_FULL) || defined(CONFIG_RFKILL_FULL_MODULE)
  77  /**
  78   * rfkill_alloc - allocate rfkill structure
  79   * @name: name of the struct -- the string is not copied internally