1
0

280-rfkill-stubs.patch 2.1 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879
  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. config RFKILL_INPUT
  25. bool "RF switch input support" if EXPERT
  26. - depends on RFKILL
  27. + depends on RFKILL_FULL
  28. depends on INPUT = y || RFKILL = INPUT
  29. default y if !EXPERT
  30. config RFKILL_REGULATOR
  31. tristate "Generic rfkill regulator driver"
  32. - depends on RFKILL || !RFKILL
  33. + depends on RFKILL_FULL || !RFKILL_FULL
  34. depends on REGULATOR
  35. help
  36. This options enable controlling radio transmitters connected to
  37. @@ -36,7 +40,7 @@ config RFKILL_REGULATOR
  38. config RFKILL_GPIO
  39. tristate "GPIO RFKILL driver"
  40. - depends on RFKILL
  41. + depends on RFKILL_FULL
  42. depends on GPIOLIB || COMPILE_TEST
  43. default n
  44. help
  45. --- a/net/rfkill/Makefile
  46. +++ b/net/rfkill/Makefile
  47. @@ -4,6 +4,6 @@
  48. rfkill-y += core.o
  49. rfkill-$(CONFIG_RFKILL_INPUT) += input.o
  50. -obj-$(CONFIG_RFKILL) += rfkill.o
  51. +obj-$(CONFIG_RFKILL_FULL) += rfkill.o
  52. obj-$(CONFIG_RFKILL_REGULATOR) += rfkill-regulator.o
  53. obj-$(CONFIG_RFKILL_GPIO) += rfkill-gpio.o
  54. --- a/net/Makefile
  55. +++ b/net/Makefile
  56. @@ -49,7 +49,7 @@ obj-$(CONFIG_MAC80211) += mac80211/
  57. obj-$(CONFIG_TIPC) += tipc/
  58. obj-$(CONFIG_NETLABEL) += netlabel/
  59. obj-$(CONFIG_IUCV) += iucv/
  60. -obj-$(CONFIG_RFKILL) += rfkill/
  61. +obj-$(CONFIG_RFKILL_FULL) += rfkill/
  62. obj-$(CONFIG_NET_9P) += 9p/
  63. obj-$(CONFIG_CAIF) += caif/
  64. ifneq ($(CONFIG_DCB),)
  65. --- a/include/linux/rfkill.h
  66. +++ b/include/linux/rfkill.h
  67. @@ -64,7 +64,7 @@ struct rfkill_ops {
  68. int (*set_block)(void *data, bool blocked);
  69. };
  70. -#if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE)
  71. +#if defined(CONFIG_RFKILL_FULL) || defined(CONFIG_RFKILL_FULL_MODULE)
  72. /**
  73. * rfkill_alloc - allocate rfkill structure
  74. * @name: name of the struct -- the string is not copied internally