diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-09-06 19:48:59 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-09-06 19:48:59 -0400 |
| commit | fff34b3412b9401a76ba9d021db1bd91cb0e02b6 (patch) | |
| tree | 870ed2d1555004e7939d15b5099017aae61c97b8 /include/linux/input | |
| parent | 28e1e58fb668e262648fb8ee8a24154633f40507 (diff) | |
| parent | 636802ef96eebe279b22ad9f9dacfe29291e45c7 (diff) | |
Merge branch 'merge' into next
Brings in various bug fixes from 3.6-rcX
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 @@ | |||
| 2 | #define LINUX_INPUT_EETI_TS_H | 2 | #define LINUX_INPUT_EETI_TS_H |
| 3 | 3 | ||
| 4 | struct eeti_ts_platform_data { | 4 | struct eeti_ts_platform_data { |
| 5 | int irq_gpio; | ||
| 5 | unsigned int irq_active_high; | 6 | unsigned int irq_active_high; |
| 6 | }; | 7 | }; |
| 7 | 8 | ||