diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-07 12:45:14 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-07 12:45:14 -0500 |
commit | 3d50337f62a61027f40ad4ceddefa3c91e5d479e (patch) | |
tree | c89bed784ab0fc402e9f4155f500170c9a335949 /drivers/misc | |
parent | 5b808a593588b2e6235c59fcd278791c53667787 (diff) | |
parent | d39a7a63eb3971b1b3cc5c181ed526bf437b1c72 (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: 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/misc')
-rw-r--r-- | drivers/misc/asus-laptop.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/asus-laptop.c b/drivers/misc/asus-laptop.c index 0846c33296bc..3a36a294e91b 100644 --- a/drivers/misc/asus-laptop.c +++ b/drivers/misc/asus-laptop.c | |||
@@ -239,7 +239,7 @@ static struct workqueue_struct *led_workqueue; | |||
239 | static int object##_led_wk; \ | 239 | static int object##_led_wk; \ |
240 | static DECLARE_WORK(object##_led_work, object##_led_update); \ | 240 | static DECLARE_WORK(object##_led_work, object##_led_update); \ |
241 | static struct led_classdev object##_led = { \ | 241 | static struct led_classdev object##_led = { \ |
242 | .name = "asus:" ledname, \ | 242 | .name = "asus::" ledname, \ |
243 | .brightness_set = object##_led_set, \ | 243 | .brightness_set = object##_led_set, \ |
244 | } | 244 | } |
245 | 245 | ||