diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-30 13:33:48 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-30 13:33:48 -0400 |
| commit | 15dd859cacf312f606f54502d1f66537a1e5c78c (patch) | |
| tree | e50e125eaa6da83fa715704e53c1bde013d1ef8e /Documentation/leds-class.txt | |
| parent | b2d9d33412b9d13a40cd314d93ab517950fc5950 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
Merge commit 'v2.6.27-rc1' into x86/core
Conflicts:
include/asm-x86/dma-mapping.h
include/asm-x86/namei.h
include/asm-x86/uaccess.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Documentation/leds-class.txt')
| -rw-r--r-- | Documentation/leds-class.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/leds-class.txt b/Documentation/leds-class.txt index 18860ad9935a..6399557cdab3 100644 --- a/Documentation/leds-class.txt +++ b/Documentation/leds-class.txt | |||
| @@ -59,7 +59,7 @@ Hardware accelerated blink of LEDs | |||
| 59 | 59 | ||
| 60 | Some LEDs can be programmed to blink without any CPU interaction. To | 60 | Some LEDs can be programmed to blink without any CPU interaction. To |
| 61 | support this feature, a LED driver can optionally implement the | 61 | support this feature, a LED driver can optionally implement the |
| 62 | blink_set() function (see <linux/leds.h>). If implemeted, triggers can | 62 | blink_set() function (see <linux/leds.h>). If implemented, triggers can |
| 63 | attempt to use it before falling back to software timers. The blink_set() | 63 | attempt to use it before falling back to software timers. The blink_set() |
| 64 | function should return 0 if the blink setting is supported, or -EINVAL | 64 | function should return 0 if the blink setting is supported, or -EINVAL |
| 65 | otherwise, which means that LED blinking will be handled by software. | 65 | otherwise, which means that LED blinking will be handled by software. |