diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-07 09:45:14 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-07 09:45:14 -0800 |
| commit | 3d50337f62a61027f40ad4ceddefa3c91e5d479e (patch) | |
| tree | c89bed784ab0fc402e9f4155f500170c9a335949 /drivers/leds/leds-spitz.c | |
| parent | 5b808a593588b2e6235c59fcd278791c53667787 (diff) | |
| parent | d39a7a63eb3971b1b3cc5c181ed526bf437b1c72 (diff) | |
| download | kernel-crypto-3d50337f62a61027f40ad4ceddefa3c91e5d479e.tar.gz kernel-crypto-3d50337f62a61027f40ad4ceddefa3c91e5d479e.tar.xz kernel-crypto-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 'drivers/leds/leds-spitz.c')
| -rw-r--r-- | drivers/leds/leds-spitz.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/leds/leds-spitz.c b/drivers/leds/leds-spitz.c index 126d09cc96e..93e1012b17e 100644 --- a/drivers/leds/leds-spitz.c +++ b/drivers/leds/leds-spitz.c @@ -38,13 +38,13 @@ static void spitzled_green_set(struct led_classdev *led_cdev, enum led_brightnes } static struct led_classdev spitz_amber_led = { - .name = "spitz:amber", + .name = "spitz:amber:charge", .default_trigger = "sharpsl-charge", .brightness_set = spitzled_amber_set, }; static struct led_classdev spitz_green_led = { - .name = "spitz:green", + .name = "spitz:green:hddactivity", .default_trigger = "ide-disk", .brightness_set = spitzled_green_set, }; @@ -72,8 +72,10 @@ static int spitzled_probe(struct platform_device *pdev) { int ret; - if (machine_is_akita()) + if (machine_is_akita()) { + spitz_green_led.name = "spitz:green:mail"; spitz_green_led.default_trigger = "nand-disk"; + } ret = led_classdev_register(&pdev->dev, &spitz_amber_led); if (ret < 0) |