aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/leds
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2009-12-06 16:53:09 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-12-06 16:53:12 +0000
commitba71e17269633ea36e776d744d5cc0fcb5a41f93 (patch)
tree0a51c86e5c218ac2ae74ff8193880a64053a77bc /drivers/leds
parentARM: 5827/1: SA1100: h3100/h3600: emit messages on failed gpio_request (diff)
parentcollie: support pda_power driver (diff)
downloadlinux-dev-ba71e17269633ea36e776d744d5cc0fcb5a41f93.tar.xz
linux-dev-ba71e17269633ea36e776d744d5cc0fcb5a41f93.zip
Merge branch 'for-lak' of git://git.linuxtogo.org/home/thesing/collie into sa1100
Diffstat (limited to 'drivers/leds')
-rw-r--r--drivers/leds/leds-locomo.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/leds/leds-locomo.c b/drivers/leds/leds-locomo.c
index 5d91362e3066..1f7c10f6b7f2 100644
--- a/drivers/leds/leds-locomo.c
+++ b/drivers/leds/leds-locomo.c
@@ -44,7 +44,7 @@ static void locomoled_brightness_set1(struct led_classdev *led_cdev,
static struct led_classdev locomo_led0 = {
.name = "locomo:amber:charge",
- .default_trigger = "sharpsl-charge",
+ .default_trigger = "main-battery-charging",
.brightness_set = locomoled_brightness_set0,
};