diff options
author | Patrick McHardy <kaber@trash.net> | 2011-04-13 07:32:28 -0400 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2011-04-13 07:32:28 -0400 |
commit | b32e3dc7860d00124fa432dba09667e647cb9bcc (patch) | |
tree | 2fa6e56f389431dfb84609d3d7572cad76e88e71 /include/linux/i2c/mcs.h | |
parent | 6604271c5bc658a6067ed0c3deba4d89e0e50382 (diff) | |
parent | 96120d86fe302c006259baee9061eea9e1b9e486 (diff) |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
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 */ |