Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / include / linux / spi / ads7846.h

diff --git a/include/linux/spi/ads7846.h b/include/linux/spi/ads7846.h
index 37c75fbacea2dbf4406779295a17c975d35854bc..e284a1f1b5ad5efc6f16f03888a98d96afccc06c 100644 (file)
--- a/include/linux/spi/ads7846.h
+++ b/include/linux/spi/ads7846.h
@@ -43,6 +43,9 @@ struct ads7846_platform_data {
        u16     debounce_tol;           /* tolerance used for filtering */
        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
+                                        */
        int     (*get_pendown_state)(void);
        int     (*filter_init)  (struct ads7846_platform_data *pdata,
                                 void **filter_data);