mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-08-19 08:33:42 +03:00
7fb8177eb8
most of the #ifdef spaghetti that the old patch introduced was completely unnecessary git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22866 3c298f89-4303-0410-b956-a3cf2f4a3e73
128 lines
2.9 KiB
Diff
128 lines
2.9 KiB
Diff
--- a/config.mk
|
|
+++ b/config.mk
|
|
@@ -115,7 +115,7 @@ CONFIG_COMPAT_MAC80211_RC_DEFAULT=minstr
|
|
# CONFIG_MAC80211_RC_PID=y
|
|
CONFIG_MAC80211_RC_MINSTREL=y
|
|
CONFIG_MAC80211_RC_MINSTREL_HT=y
|
|
-CONFIG_MAC80211_LEDS=y
|
|
+# CONFIG_MAC80211_LEDS=y
|
|
|
|
# enable mesh networking too
|
|
CONFIG_MAC80211_MESH=y
|
|
@@ -218,7 +218,7 @@ CONFIG_B43_PCI_AUTOSELECT=y
|
|
ifneq ($(CONFIG_PCMCIA),)
|
|
# CONFIG_B43_PCMCIA=y
|
|
endif
|
|
-CONFIG_B43_LEDS=y
|
|
+# CONFIG_B43_LEDS=y
|
|
CONFIG_B43_PHY_LP=y
|
|
# CONFIG_B43_NPHY is not set
|
|
# CONFIG_B43_FORCE_PIO=y
|
|
@@ -227,7 +227,7 @@ CONFIG_B43_PHY_LP=y
|
|
CONFIG_B43LEGACY=m
|
|
CONFIG_B43LEGACY_HWRNG=y
|
|
CONFIG_B43LEGACY_PCI_AUTOSELECT=y
|
|
-CONFIG_B43LEGACY_LEDS=y
|
|
+# CONFIG_B43LEGACY_LEDS=y
|
|
# CONFIG_B43LEGACY_DEBUG=y
|
|
CONFIG_B43LEGACY_DMA=y
|
|
CONFIG_B43LEGACY_PIO=y
|
|
@@ -499,7 +499,7 @@ endif
|
|
|
|
# p54
|
|
CONFIG_P54_COMMON=m
|
|
-CONFIG_P54_LEDS=y
|
|
+# CONFIG_P54_LEDS=y
|
|
|
|
# Atheros
|
|
CONFIG_ATH_COMMON=m
|
|
--- a/drivers/net/wireless/ath/ath9k/gpio.c
|
|
+++ b/drivers/net/wireless/ath/ath9k/gpio.c
|
|
@@ -54,6 +54,7 @@ static void ath_led_blink_work(struct wo
|
|
sc->sc_flags |= SC_OP_LED_ON;
|
|
}
|
|
|
|
+#ifdef CONFIG_LEDS_CLASS
|
|
static void ath_led_brightness(struct led_classdev *led_cdev,
|
|
enum led_brightness brightness)
|
|
{
|
|
@@ -90,10 +91,12 @@ static void ath_led_brightness(struct le
|
|
break;
|
|
}
|
|
}
|
|
+#endif
|
|
|
|
static int ath_register_led(struct ath_softc *sc, struct ath_led *led,
|
|
char *trigger)
|
|
{
|
|
+#ifdef CONFIG_LEDS_CLASS
|
|
int ret;
|
|
|
|
led->sc = sc;
|
|
@@ -108,14 +111,19 @@ static int ath_register_led(struct ath_s
|
|
else
|
|
led->registered = 1;
|
|
return ret;
|
|
+#else
|
|
+ return 0;
|
|
+#endif
|
|
}
|
|
|
|
static void ath_unregister_led(struct ath_led *led)
|
|
{
|
|
+#ifdef CONFIG_LEDS_CLASS
|
|
if (led->registered) {
|
|
led_classdev_unregister(&led->led_cdev);
|
|
led->registered = 0;
|
|
}
|
|
+#endif
|
|
}
|
|
|
|
void ath_deinit_leds(struct ath_softc *sc)
|
|
--- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c
|
|
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
|
|
@@ -872,6 +872,7 @@ static void ath9k_led_brightness_work(st
|
|
}
|
|
}
|
|
|
|
+#ifdef CONFIG_LEDS_CLASS
|
|
static void ath9k_led_brightness(struct led_classdev *led_cdev,
|
|
enum led_brightness brightness)
|
|
{
|
|
@@ -883,6 +884,7 @@ static void ath9k_led_brightness(struct
|
|
ieee80211_queue_delayed_work(priv->hw,
|
|
&led->brightness_work, 0);
|
|
}
|
|
+#endif
|
|
|
|
static void ath9k_led_stop_brightness(struct ath9k_htc_priv *priv)
|
|
{
|
|
@@ -895,6 +897,7 @@ static void ath9k_led_stop_brightness(st
|
|
static int ath9k_register_led(struct ath9k_htc_priv *priv, struct ath_led *led,
|
|
char *trigger)
|
|
{
|
|
+#ifdef CONFIG_LEDS_CLASS
|
|
int ret;
|
|
|
|
led->priv = priv;
|
|
@@ -912,14 +915,19 @@ static int ath9k_register_led(struct ath
|
|
INIT_DELAYED_WORK(&led->brightness_work, ath9k_led_brightness_work);
|
|
|
|
return ret;
|
|
+#else
|
|
+ return 0;
|
|
+#endif
|
|
}
|
|
|
|
static void ath9k_unregister_led(struct ath_led *led)
|
|
{
|
|
+#ifdef CONFIG_LEDS_CLASS
|
|
if (led->registered) {
|
|
led_classdev_unregister(&led->led_cdev);
|
|
led->registered = 0;
|
|
}
|
|
+#endif
|
|
}
|
|
|
|
void ath9k_deinit_leds(struct ath9k_htc_priv *priv)
|