diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-25 21:00:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-25 21:00:29 -0700 |
| commit | 56a9ccb7ba5ffd5f285e3a9628cb446192c8639c (patch) | |
| tree | a9d54537cea4761073374ef5fbc9097cbfe52440 /include/linux/leds.h | |
| parent | 44bbd7ac2658eb1118342493026ef141e259b739 (diff) | |
| parent | 909a78b320b31ca9709d7ea5f602ec1bd2015192 (diff) | |
| download | blackbird-op-linux-56a9ccb7ba5ffd5f285e3a9628cb446192c8639c.tar.gz blackbird-op-linux-56a9ccb7ba5ffd5f285e3a9628cb446192c8639c.zip | |
Merge git://git.infradead.org/battery-2.6
* git://git.infradead.org/battery-2.6: (30 commits)
bq20z75: Fix time and temp units
bq20z75: Fix issues with present and suspend
z2_battery: Fix count of properties
s3c_adc_battery: Fix method names when PM not set
z2_battery: Add MODULE_DEVICE_TABLE
ds2782_battery: Add MODULE_DEVICE_TABLE
bq20z75: Add MODULE_DEVICE_TABLE
power_supply: Update power_supply_is_watt_property
bq20z75: Add i2c retry mechanism
bq20z75: Add optional battery detect gpio
twl4030_charger: Make the driver atomic notifier safe
bq27x00: Use single i2c_transfer call for property read
bq27x00: Cleanup bq27x00_i2c_read
bq27x00: Minor cleanups
bq27x00: Give more specific reports on battery status
bq27x00: Add MODULE_DEVICE_TABLE
bq27x00: Add new properties
bq27x00: Poll battery state
bq27x00: Cache battery registers
bq27x00: Add bq27000 support
...
Diffstat (limited to 'include/linux/leds.h')
| -rw-r--r-- | include/linux/leds.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/leds.h b/include/linux/leds.h index 383811d9af83..61e0340a4b77 100644 --- a/include/linux/leds.h +++ b/include/linux/leds.h @@ -145,6 +145,9 @@ extern void led_trigger_register_simple(const char *name, extern void led_trigger_unregister_simple(struct led_trigger *trigger); extern void led_trigger_event(struct led_trigger *trigger, enum led_brightness event); +extern void led_trigger_blink(struct led_trigger *trigger, + unsigned long *delay_on, + unsigned long *delay_off); #else |
