008-led_default.patch 2.0 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384
  1. --- a/config.mk
  2. +++ b/config.mk
  3. @@ -132,7 +132,7 @@ CONFIG_COMPAT_MAC80211_RC_DEFAULT=minstr
  4. CONFIG_MAC80211_RC_PID=y
  5. CONFIG_MAC80211_RC_MINSTREL=y
  6. CONFIG_MAC80211_RC_MINSTREL_HT=y
  7. -CONFIG_MAC80211_LEDS=y
  8. +# CONFIG_MAC80211_LEDS=y
  9. # enable mesh networking too
  10. CONFIG_MAC80211_MESH=y
  11. @@ -242,7 +242,7 @@ CONFIG_B43_PCI_AUTOSELECT=y
  12. ifdef CONFIG_PCMCIA
  13. CONFIG_B43_PCMCIA=y
  14. endif #CONFIG_PCMCIA
  15. -CONFIG_B43_LEDS=y
  16. +# CONFIG_B43_LEDS=y
  17. CONFIG_B43_PHY_LP=y
  18. CONFIG_B43_PHY_N=y
  19. # CONFIG_B43_FORCE_PIO=y
  20. @@ -251,7 +251,7 @@ CONFIG_B43_PHY_N=y
  21. CONFIG_B43LEGACY=m
  22. CONFIG_B43LEGACY_HWRNG=y
  23. CONFIG_B43LEGACY_PCI_AUTOSELECT=y
  24. -CONFIG_B43LEGACY_LEDS=y
  25. +# CONFIG_B43LEGACY_LEDS=y
  26. # CONFIG_B43LEGACY_DEBUG=y
  27. CONFIG_B43LEGACY_DMA=y
  28. CONFIG_B43LEGACY_PIO=y
  29. @@ -561,7 +561,7 @@ endif
  30. # p54
  31. CONFIG_P54_COMMON=m
  32. -CONFIG_P54_LEDS=y
  33. +# CONFIG_P54_LEDS=y
  34. # Atheros
  35. CONFIG_ATH_COMMON=m
  36. --- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c
  37. +++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
  38. @@ -864,6 +864,7 @@ static void ath9k_led_brightness_work(st
  39. }
  40. }
  41. +#ifdef CONFIG_LEDS_CLASS
  42. static void ath9k_led_brightness(struct led_classdev *led_cdev,
  43. enum led_brightness brightness)
  44. {
  45. @@ -875,6 +876,7 @@ static void ath9k_led_brightness(struct
  46. ieee80211_queue_delayed_work(priv->hw,
  47. &led->brightness_work, 0);
  48. }
  49. +#endif
  50. static void ath9k_led_stop_brightness(struct ath9k_htc_priv *priv)
  51. {
  52. @@ -887,6 +889,7 @@ static void ath9k_led_stop_brightness(st
  53. static int ath9k_register_led(struct ath9k_htc_priv *priv, struct ath_led *led,
  54. char *trigger)
  55. {
  56. +#ifdef CONFIG_LEDS_CLASS
  57. int ret;
  58. led->priv = priv;
  59. @@ -904,14 +907,19 @@ static int ath9k_register_led(struct ath
  60. INIT_DELAYED_WORK(&led->brightness_work, ath9k_led_brightness_work);
  61. return ret;
  62. +#else
  63. + return 0;
  64. +#endif
  65. }
  66. static void ath9k_unregister_led(struct ath_led *led)
  67. {
  68. +#ifdef CONFIG_LEDS_CLASS
  69. if (led->registered) {
  70. led_classdev_unregister(&led->led_cdev);
  71. led->registered = 0;
  72. }
  73. +#endif
  74. }
  75. void ath9k_deinit_leds(struct ath9k_htc_priv *priv)