diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-09-19 13:21:21 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-09-19 13:21:21 -0400 |
| commit | 0b6c404a07e3240b95aa5682fb8fd57c41609d7a (patch) | |
| tree | c4d410b0ec7044922b73c39ecfb3fbb620c29282 /include/linux/extcon/extcon_gpio.h | |
| parent | 609455f481772c5a875b88e860a2ee0e2f25ebf0 (diff) | |
| parent | 55d512e245bc7699a8800e23df1a24195dd08217 (diff) | |
Merge tag 'v3.6-rc5' into for-linus
Sync with mainline so that I can revert an input patch that came in through
another subsystem tree.
Diffstat (limited to 'include/linux/extcon/extcon_gpio.h')
| -rw-r--r-- | include/linux/extcon/extcon_gpio.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/extcon/extcon_gpio.h b/include/linux/extcon/extcon_gpio.h index a2129b73dcb1..2d8307f7d67d 100644 --- a/include/linux/extcon/extcon_gpio.h +++ b/include/linux/extcon/extcon_gpio.h | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | * @irq_flags IRQ Flags (e.g., IRQF_TRIGGER_LOW). | 31 | * @irq_flags IRQ Flags (e.g., IRQF_TRIGGER_LOW). |
| 32 | * @state_on print_state is overriden with state_on if attached. If Null, | 32 | * @state_on print_state is overriden with state_on if attached. If Null, |
| 33 | * default method of extcon class is used. | 33 | * default method of extcon class is used. |
| 34 | * @state_off print_state is overriden with state_on if dettached. If Null, | 34 | * @state_off print_state is overriden with state_on if detached. If Null, |
| 35 | * default method of extcon class is used. | 35 | * default method of extcon class is used. |
| 36 | * | 36 | * |
| 37 | * Note that in order for state_on or state_off to be valid, both state_on | 37 | * Note that in order for state_on or state_off to be valid, both state_on |