diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-09 13:55:37 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-09 13:55:37 -0800 |
| commit | d7d717fa889fc7a60c38497846c7618940a999d9 (patch) | |
| tree | 8a19ffa13d305588a4433defb9f128ed68ecf47c /include/linux/leds.h | |
| parent | b64dc5a4842c3420d7a093bf5e8979c57ceb789c (diff) | |
| parent | ce70a24575414d615f6a7a05caf9b7e8f91a1b6f (diff) | |
| download | op-kernel-dev-d7d717fa889fc7a60c38497846c7618940a999d9.zip op-kernel-dev-d7d717fa889fc7a60c38497846c7618940a999d9.tar.gz | |
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: ledtrig-timer - on deactivation hardware blinking should be disabled
leds: Add suspend/resume to the core class
leds: Add WM8350 LED driver
leds: leds-pcs9532 - Move i2c work to a workqueque
leds: leds-pca9532 - fix memory leak and properly handle errors
leds: Fix wrong loop direction on removal in leds-ams-delta
leds: fix Cobalt Raq LED dependency
leds: Fix sparse warning in leds-ams-delta
leds: Fixup kdoc comment to match parameter names
leds: Make header variable naming consistent
leds: eds-pca9532: mark pca9532_event() static
leds: ALIX.2 LEDs driver
Diffstat (limited to 'include/linux/leds.h')
| -rw-r--r-- | include/linux/leds.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/leds.h b/include/linux/leds.h index d3a73f5..24489da 100644 --- a/include/linux/leds.h +++ b/include/linux/leds.h @@ -32,7 +32,10 @@ struct led_classdev { int brightness; int flags; + /* Lower 16 bits reflect status */ #define LED_SUSPENDED (1 << 0) + /* Upper 16 bits reflect control information */ +#define LED_CORE_SUSPENDRESUME (1 << 16) /* Set LED brightness level */ /* Must not sleep, use a workqueue if needed */ @@ -62,7 +65,7 @@ struct led_classdev { extern int led_classdev_register(struct device *parent, struct led_classdev *led_cdev); -extern void led_classdev_unregister(struct led_classdev *lcd); +extern void led_classdev_unregister(struct led_classdev *led_cdev); extern void led_classdev_suspend(struct led_classdev *led_cdev); extern void led_classdev_resume(struct led_classdev *led_cdev); |
