diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-02-02 03:43:20 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-02-02 03:43:20 -0500 |
| commit | 65370bdf881e20907e7a53abab9b8c0bc5f60a6b (patch) | |
| tree | 0d32a494e873b7b92dbfab0e67ffeef597ee8108 /include/linux/extcon/extcon-gpio.h | |
| parent | e207552e64ea053a33e856828ad7915484911d06 (diff) | |
| parent | 5cb480f6b488128140c940abff3c36f524a334a8 (diff) | |
Merge branch 'linus' into core/locking
Refresh the topic.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/extcon/extcon-gpio.h')
| -rw-r--r-- | include/linux/extcon/extcon-gpio.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/extcon/extcon-gpio.h b/include/linux/extcon/extcon-gpio.h index 4195810f87fe..8900fdf511c6 100644 --- a/include/linux/extcon/extcon-gpio.h +++ b/include/linux/extcon/extcon-gpio.h | |||
| @@ -51,6 +51,7 @@ struct gpio_extcon_platform_data { | |||
| 51 | /* if NULL, "0" or "1" will be printed */ | 51 | /* if NULL, "0" or "1" will be printed */ |
| 52 | const char *state_on; | 52 | const char *state_on; |
| 53 | const char *state_off; | 53 | const char *state_off; |
| 54 | bool check_on_resume; | ||
| 54 | }; | 55 | }; |
| 55 | 56 | ||
| 56 | #endif /* __EXTCON_GPIO_H__ */ | 57 | #endif /* __EXTCON_GPIO_H__ */ |