Merge branch 'pxa-all' into devel

Conflicts:

	arch/arm/mach-pxa/Kconfig
	arch/arm/mach-pxa/corgi.c
	arch/arm/mach-pxa/include/mach/hardware.h
	arch/arm/mach-pxa/spitz.c

1 files changed, 3 insertions, 0 deletions

diff --git a/include/linux/spi/ads7846.h b/include/linux/spi/ads7846.h
index daf744017a31..05eab2f11e63 100644
--- 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);