diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-08-28 18:05:55 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-08-28 18:05:55 +0200 |
| commit | 508dc4f8eece1a70c493afc6511fdf5934fef567 (patch) | |
| tree | b852a6a5bf9977a33a87158985de02d188ba71d7 /include/linux/input | |
| parent | 734e9a26d612f64e1c9cfd92256969b773954ae2 (diff) | |
| parent | e3e45c01ae690e65f2650e5288b9af802e95a136 (diff) | |
Merge branch 'perf/urgent' into perf/core
Pick up the latest fixes because upcoming uprobes changes will rely on it.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/input')
| -rw-r--r-- | include/linux/input/eeti_ts.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/input/eeti_ts.h b/include/linux/input/eeti_ts.h index f875b316249d..16625d799b6f 100644 --- a/include/linux/input/eeti_ts.h +++ b/include/linux/input/eeti_ts.h @@ -2,6 +2,7 @@ #define LINUX_INPUT_EETI_TS_H struct eeti_ts_platform_data { + int irq_gpio; unsigned int irq_active_high; }; |