diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:15 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:59 -0400 |
| commit | 07f9479a40cc778bc1462ada11f95b01360ae4ff (patch) | |
| tree | 0676cf38df3844004bb3ebfd99dfa67a4a8998f5 /include/linux/i2c/mcs.h | |
| parent | 9d5e6bdb3013acfb311ab407eeca0b6a6a3dedbf (diff) | |
| parent | cd2e49e90f1cae7726c9a2c54488d881d7f1cd1c (diff) | |
Merge branch 'master' into for-next
Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.
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 */ |