diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /include/linux/i2c/mcs.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
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 */ |