diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-26 13:50:47 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-26 13:50:47 -0400 |
| commit | cce1d9f23213f3a8a43b6038df84a665aa8d8612 (patch) | |
| tree | 0ef75bc1641f7202763591a91fc6030898470f7b /drivers/macintosh | |
| parent | d910fc786014ac3fb72f837c329c112e0c7a9aea (diff) | |
| parent | f16a5dba01ed942f427f56b0d1128251721275a5 (diff) | |
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: move leds-clevo-mail's probe function to .devinit.text
leds: Fix indentation in LEDS_LP3944 Kconfig entry
leds: Fix LED names
leds: Fix leds-pca9532 whitespace issues
leds: fix coding style in worker thread code for ledtrig-gpio.
leds: gpio-leds: fix typographics fault
leds: Add WM831x status LED driver
Diffstat (limited to 'drivers/macintosh')
| -rw-r--r-- | drivers/macintosh/via-pmu-led.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/macintosh/via-pmu-led.c b/drivers/macintosh/via-pmu-led.c index 55ad95671387..d242976bcfe7 100644 --- a/drivers/macintosh/via-pmu-led.c +++ b/drivers/macintosh/via-pmu-led.c | |||
| @@ -72,7 +72,7 @@ static void pmu_led_set(struct led_classdev *led_cdev, | |||
| 72 | } | 72 | } |
| 73 | 73 | ||
| 74 | static struct led_classdev pmu_led = { | 74 | static struct led_classdev pmu_led = { |
| 75 | .name = "pmu-front-led", | 75 | .name = "pmu-led::front", |
| 76 | #ifdef CONFIG_ADB_PMU_LED_IDE | 76 | #ifdef CONFIG_ADB_PMU_LED_IDE |
| 77 | .default_trigger = "ide-disk", | 77 | .default_trigger = "ide-disk", |
| 78 | #endif | 78 | #endif |