diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-11-24 00:02:54 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-11-24 00:02:54 -0800 |
| commit | 5e7fe820fa1fdf1988e71c0c1070b5d9bdd4fcf1 (patch) | |
| tree | c5aa57e70d901ae05b25e61387a351e6b0b2826b /include | |
| parent | Input: stmpe-ts - add DT support for stmpe touchscreen (diff) | |
| parent | ARM - OMAP: ads7846: fix pendown debounce setting (diff) | |
Merge branch 'for-linus' into next
Bring in changes to ads7846 to avoid mereg conflicts.
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/spi/ads7846.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/spi/ads7846.h b/include/linux/spi/ads7846.h index c64de9dd7631..2f694f3846a9 100644 --- a/include/linux/spi/ads7846.h +++ b/include/linux/spi/ads7846.h @@ -46,8 +46,9 @@ struct ads7846_platform_data { u16 debounce_rep; /* additional consecutive good readings * required after the first two */ int gpio_pendown; /* the GPIO used to decide the pendown - * state if get_pendown_state == NULL - */ + * state if get_pendown_state == NULL */ + int gpio_pendown_debounce; /* platform specific debounce time for + * the gpio_pendown */ int (*get_pendown_state)(void); int (*filter_init) (const struct ads7846_platform_data *pdata, void **filter_data); |