Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds

* 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds:
  leds: Add HP Jornada 6xx driver
  leds: Remove the now uneeded ixp4xx driver
  leds: Add power LED to the wrap driver
  leds: Fix led-gpio active_low default brightness
  leds: hw acceleration for Clevo mail LED driver
  leds: Add support for hardware accelerated LED flashing
  leds: Standardise LED naming scheme
  leds: Add clevo notebook LED driver

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/net/wireless/b43/leds.c b/drivers/net/wireless/b43/leds.c
index 0908335892db..0aac1ff511df 100644
--- a/drivers/net/wireless/b43/leds.c
+++ b/drivers/net/wireless/b43/leds.c
@@ -147,12 +147,12 @@ static void b43_map_led(struct b43_wldev *dev,
         case B43_LED_TRANSFER:
         case B43_LED_APTRANSFER:
                 snprintf(name, sizeof(name),
-                         "b43-%s:tx", wiphy_name(hw->wiphy));
+                         "b43-%s::tx", wiphy_name(hw->wiphy));
                 b43_register_led(dev, &dev->led_tx, name,
                                  ieee80211_get_tx_led_name(hw),
                                  led_index, activelow);
                 snprintf(name, sizeof(name),
-                         "b43-%s:rx", wiphy_name(hw->wiphy));
+                         "b43-%s::rx", wiphy_name(hw->wiphy));
                 b43_register_led(dev, &dev->led_rx, name,
                                  ieee80211_get_rx_led_name(hw),
                                  led_index, activelow);
@@ -162,7 +162,7 @@ static void b43_map_led(struct b43_wldev *dev,
         case B43_LED_RADIO_B:
         case B43_LED_MODE_BG:
                 snprintf(name, sizeof(name),
-                         "b43-%s:radio", wiphy_name(hw->wiphy));
+                         "b43-%s::radio", wiphy_name(hw->wiphy));
                 b43_register_led(dev, &dev->led_radio, name,
                                  b43_rfkill_led_name(dev),
                                  led_index, activelow);
@@ -173,7 +173,7 @@ static void b43_map_led(struct b43_wldev *dev,
         case B43_LED_WEIRD:
         case B43_LED_ASSOC:
                 snprintf(name, sizeof(name),
-                         "b43-%s:assoc", wiphy_name(hw->wiphy));
+                         "b43-%s::assoc", wiphy_name(hw->wiphy));
                 b43_register_led(dev, &dev->led_assoc, name,
                                  ieee80211_get_assoc_led_name(hw),
                                  led_index, activelow);