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

3 files changed, 9 insertions, 9 deletions

diff --git a/arch/arm/mach-ixp4xx/dsmg600-setup.c b/arch/arm/mach-ixp4xx/dsmg600-setup.c
index 688659668bdf..8cb07437a807 100644
--- a/arch/arm/mach-ixp4xx/dsmg600-setup.c
+++ b/arch/arm/mach-ixp4xx/dsmg600-setup.c
@@ -71,11 +71,11 @@ static struct i2c_board_info __initdata dsmg600_i2c_board_info [] = {
 
 static struct gpio_led dsmg600_led_pins[] = {
         {
-                .name           = "power",
+                .name           = "dsmg600:green:power",
                 .gpio           = DSMG600_LED_PWR_GPIO,
         },
         {
-                .name           = "wlan",
+                .name           = "dsmg600:green:wlan",
                 .gpio           = DSMG600_LED_WLAN_GPIO,
                 .active_low     = true,
         },
diff --git a/arch/arm/mach-ixp4xx/nas100d-setup.c b/arch/arm/mach-ixp4xx/nas100d-setup.c
index 4cecae84837b..159e1c4f1eda 100644
--- a/arch/arm/mach-ixp4xx/nas100d-setup.c
+++ b/arch/arm/mach-ixp4xx/nas100d-setup.c
@@ -60,17 +60,17 @@ static struct i2c_board_info __initdata nas100d_i2c_board_info [] = {
 
 static struct gpio_led nas100d_led_pins[] = {
         {
-                .name           = "wlan",   /* green led */
+                .name           = "nas100d:green:wlan",
                 .gpio           = NAS100D_LED_WLAN_GPIO,
                 .active_low     = true,
         },
         {
-                .name           = "power",  /* blue power led (off=flashing) */
+                .name           = "nas100d:blue:power",  /* (off=flashing) */
                 .gpio           = NAS100D_LED_PWR_GPIO,
                 .active_low     = true,
         },
         {
-                .name           = "disk",   /* yellow led */
+                .name           = "nas100d:yellow:disk",
                 .gpio           = NAS100D_LED_DISK_GPIO,
                 .active_low     = true,
         },
diff --git a/arch/arm/mach-ixp4xx/nslu2-setup.c b/arch/arm/mach-ixp4xx/nslu2-setup.c
index acaebcbce53a..d9a182895a0f 100644
--- a/arch/arm/mach-ixp4xx/nslu2-setup.c
+++ b/arch/arm/mach-ixp4xx/nslu2-setup.c
@@ -63,20 +63,20 @@ static struct i2c_board_info __initdata nslu2_i2c_board_info [] = {
 
 static struct gpio_led nslu2_led_pins[] = {
         {
-                .name           = "ready",  /* green led */
+                .name           = "nslu2:green:ready",
                 .gpio           = NSLU2_LED_GRN_GPIO,
         },
         {
-                .name           = "status", /* red led */
+                .name           = "nslu2:red:status",
                 .gpio           = NSLU2_LED_RED_GPIO,
         },
         {
-                .name           = "disk-1",
+                .name           = "nslu2:green:disk-1",
                 .gpio           = NSLU2_LED_DISK1_GPIO,
                 .active_low     = true,
         },
         {
-                .name           = "disk-2",
+                .name           = "nslu2:green:disk-2",
                 .gpio           = NSLU2_LED_DISK2_GPIO,
                 .active_low     = true,
         },