Christian Lamparter wrote: > This patch fixes a compile problem when the MAC80211_LEDS > triggers are enabled but not LED class itself. > (which is sort of pointless, but anyway...) > > Signed-off-by: Christian Lamparter <chunkeey@xxxxxx> > --- > mb, thank you for the tips! > > Randy Dunlap can you please give this patch a try? Acked-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx> Thanks. > John, do you know where the patch form > Geert Uytterhoeven <geert@xxxxxxxxxxxxxx> went? > --- > diff --git a/drivers/net/wireless/p54/Kconfig b/drivers/net/wireless/p54/Kconfig > index 0e344ac..ee1aaca 100644 > --- a/drivers/net/wireless/p54/Kconfig > +++ b/drivers/net/wireless/p54/Kconfig > @@ -1,9 +1,10 @@ > config P54_COMMON > tristate "Softmac Prism54 support" > - depends on MAC80211 && WLAN_80211 && FW_LOADER && EXPERIMENTAL > + depends on MAC80211 && WLAN_80211 && EXPERIMENTAL > + select FW_LOADER > ---help--- > - This is common code for isl38xx based cards. > - This module does nothing by itself - the USB/PCI frontends > + This is common code for isl38xx/stlc45xx based modules. > + This module does nothing by itself - the USB/PCI/SPI frontends > also need to be enabled in order to support any devices. > > These devices require softmac firmware which can be found at > @@ -17,31 +18,6 @@ config P54_USB > select CRC32 > ---help--- > This driver is for USB isl38xx based wireless cards. > - These are USB based adapters found in devices such as: > - > - 3COM 3CRWE254G72 > - SMC 2862W-G > - Accton 802.11g WN4501 USB > - Siemens Gigaset USB > - Netgear WG121 > - Netgear WG111 > - Medion 40900, Roper Europe > - Shuttle PN15, Airvast WM168g, IOGear GWU513 > - Linksys WUSB54G > - Linksys WUSB54G Portable > - DLink DWL-G120 Spinnaker > - DLink DWL-G122 > - Belkin F5D7050 ver 1000 > - Cohiba Proto board > - SMC 2862W-G version 2 > - U.S. Robotics U5 802.11g Adapter > - FUJITSU E-5400 USB D1700 > - Sagem XG703A > - DLink DWL-G120 Cohiba > - Spinnaker Proto board > - Linksys WUSB54AG > - Inventel UR054G > - Spinnaker DUT > > These devices require softmac firmware which can be found at > http://prism54.org/ > @@ -71,3 +47,8 @@ config P54_SPI > Nokia's N800/N810 Portable Internet Tablet. > > If you choose to build a module, it'll be called p54spi. > + > +config P54_LEDS > + bool > + depends on P54_COMMON && MAC80211_LEDS && (LEDS_CLASS = y || LEDS_CLASS = P54_COMMON) > + default y > diff --git a/drivers/net/wireless/p54/p54common.c b/drivers/net/wireless/p54/p54common.c > index 0a98983..0c1b057 100644 > --- a/drivers/net/wireless/p54/p54common.c > +++ b/drivers/net/wireless/p54/p54common.c > @@ -21,9 +21,9 @@ > #include <linux/etherdevice.h> > > #include <net/mac80211.h> > -#ifdef CONFIG_MAC80211_LEDS > +#ifdef CONFIG_P54_LEDS > #include <linux/leds.h> > -#endif /* CONFIG_MAC80211_LEDS */ > +#endif /* CONFIG_P54_LEDS */ > > #include "p54.h" > #include "p54common.h" > @@ -2420,7 +2420,7 @@ static int p54_set_key(struct ieee80211_hw *dev, enum set_key_cmd cmd, > return 0; > } > > -#ifdef CONFIG_MAC80211_LEDS > +#ifdef CONFIG_P54_LEDS > static void p54_led_brightness_set(struct led_classdev *led_dev, > enum led_brightness brightness) > { > @@ -2508,7 +2508,7 @@ static void p54_unregister_leds(struct ieee80211_hw *dev) > if (priv->assoc_led.registered) > led_classdev_unregister(&priv->assoc_led.led_dev); > } > -#endif /* CONFIG_MAC80211_LEDS */ > +#endif /* CONFIG_P54_LEDS */ > > static const struct ieee80211_ops p54_ops = { > .tx = p54_tx, > @@ -2592,11 +2592,11 @@ int p54_register_common(struct ieee80211_hw *dev, struct device *pdev) > return err; > } > > - #ifdef CONFIG_MAC80211_LEDS > +#ifdef CONFIG_P54_LEDS > err = p54_init_leds(dev); > if (err) > return err; > - #endif /* CONFIG_MAC80211_LEDS */ > +#endif /* CONFIG_P54_LEDS */ > > dev_info(pdev, "is registered as '%s'\n", wiphy_name(dev->wiphy)); > return 0; > @@ -2610,9 +2610,9 @@ void p54_free_common(struct ieee80211_hw *dev) > kfree(priv->output_limit); > kfree(priv->curve_data); > > - #ifdef CONFIG_MAC80211_LEDS > +#ifdef CONFIG_P54_LEDS > p54_unregister_leds(dev); > - #endif /* CONFIG_MAC80211_LEDS */ > +#endif /* CONFIG_P54_LEDS */ > } > EXPORT_SYMBOL_GPL(p54_free_common); > -- ~Randy -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
