diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-07 18:45:14 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-07 18:45:14 +0100 |
| commit | 3d50337f62a61027f40ad4ceddefa3c91e5d479e (patch) | |
| tree | c89bed784ab0fc402e9f4155f500170c9a335949 /arch/arm/mach-ixp4xx/nslu2-setup.c | |
| parent | m68k: kill page walker compile warning (diff) | |
| parent | leds: Add HP Jornada 6xx driver (diff) | |
| download | linux-3d50337f62a61027f40ad4ceddefa3c91e5d479e.tar.xz linux-3d50337f62a61027f40ad4ceddefa3c91e5d479e.zip | |
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
Diffstat (limited to 'arch/arm/mach-ixp4xx/nslu2-setup.c')
| -rw-r--r-- | arch/arm/mach-ixp4xx/nslu2-setup.c | 8 |
1 files changed, 4 insertions, 4 deletions
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, }, |