diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-03-19 02:38:50 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-03-19 02:38:50 -0400 |
| commit | 97eb3f24352ec6632c2127b35d8087d2a809a9b9 (patch) | |
| tree | 722948059bbd325bbca232269490124231df80d4 /include/linux/i2c/mcs.h | |
| parent | 439581ec07fa9cf3f519dd461a2cf41cfd3adcb4 (diff) | |
| parent | def179c271ac9b5020deca798470521f14d11edd (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'include/linux/i2c/mcs.h')
| -rw-r--r-- | include/linux/i2c/mcs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/i2c/mcs.h b/include/linux/i2c/mcs.h index 725ae7c313ff..61bb18a4fd3c 100644 --- a/include/linux/i2c/mcs.h +++ b/include/linux/i2c/mcs.h | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #define MCS_KEY_CODE(v) ((v) & 0xffff) | 18 | #define MCS_KEY_CODE(v) ((v) & 0xffff) |
| 19 | 19 | ||
| 20 | struct mcs_platform_data { | 20 | struct mcs_platform_data { |
| 21 | void (*poweron)(bool); | ||
| 21 | void (*cfg_pin)(void); | 22 | void (*cfg_pin)(void); |
| 22 | 23 | ||
| 23 | /* touchscreen */ | 24 | /* touchscreen */ |