diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/leds/leds-locomo.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/leds/leds-locomo.c')
| -rw-r--r-- | drivers/leds/leds-locomo.c | 2 |
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, | |||
| 44 | 44 | ||
| 45 | static struct led_classdev locomo_led0 = { | 45 | static struct led_classdev locomo_led0 = { |
| 46 | .name = "locomo:amber:charge", | 46 | .name = "locomo:amber:charge", |
| 47 | .default_trigger = "sharpsl-charge", | 47 | .default_trigger = "main-battery-charging", |
| 48 | .brightness_set = locomoled_brightness_set0, | 48 | .brightness_set = locomoled_brightness_set0, |
| 49 | }; | 49 | }; |
| 50 | 50 | ||