002-disable_rfkill.patch 1.4 KB

1234567891011121314151617181920212223242526272829303132333435363738
  1. --- a/config.mk
  2. +++ b/config.mk
  3. @@ -74,7 +74,7 @@ endif # build check
  4. endif # kernel Makefile check
  5. # These both are needed by compat-wireless || compat-bluetooth so enable them
  6. - CONFIG_COMPAT_RFKILL=y
  7. +# CONFIG_COMPAT_RFKILL=y
  8. ifeq ($(CONFIG_MAC80211),y)
  9. $(error "ERROR: you have MAC80211 compiled into the kernel, CONFIG_MAC80211=y, as such you cannot replace its mac80211 driver. You need this set to CONFIG_MAC80211=m. If you are using Fedora upgrade your kernel as later version should this set as modular. For further information on Fedora see https://bugzilla.redhat.com/show_bug.cgi?id=470143. If you are using your own kernel recompile it and make mac80211 modular")
  10. @@ -623,10 +623,10 @@ endif #CONFIG_COMPAT_KERNEL_27
  11. # We need the backported rfkill module on kernel < 2.6.31.
  12. # In more recent kernel versions use the in kernel rfkill module.
  13. ifdef CONFIG_COMPAT_KERNEL_31
  14. -CONFIG_RFKILL_BACKPORT=m
  15. +# CONFIG_RFKILL_BACKPORT=m
  16. ifdef CONFIG_LEDS_TRIGGERS
  17. -CONFIG_RFKILL_BACKPORT_LEDS=y
  18. +# CONFIG_RFKILL_BACKPORT_LEDS=y
  19. endif #CONFIG_LEDS_TRIGGERS
  20. -CONFIG_RFKILL_BACKPORT_INPUT=y
  21. +# CONFIG_RFKILL_BACKPORT_INPUT=y
  22. endif #CONFIG_COMPAT_KERNEL_31
  23. --- a/include/linux/rfkill.h
  24. +++ b/include/linux/rfkill.h
  25. @@ -3,6 +3,10 @@
  26. #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31))
  27. +#undef CONFIG_RFKILL
  28. +#undef CONFIG_RFKILL_LEDS
  29. +#undef CONFIG_RFKILL_MODULE
  30. +
  31. #include_next <linux/rfkill.h>
  32. #else