Merge branch 'next' into for-linus

First round of input updates for 3.14.

1 files changed, 3 insertions, 5 deletions

diff --git a/include/linux/i2c/tsc2007.h b/include/linux/i2c/tsc2007.h
index 506a9f7af51e..4f35b6ad3889 100644
--- a/include/linux/i2c/tsc2007.h
+++ b/include/linux/i2c/tsc2007.h
@@ -7,16 +7,14 @@ struct tsc2007_platform_data {
         u16     model;                          /* 2007. */
         u16     x_plate_ohms;   /* must be non-zero value */
         u16     max_rt; /* max. resistance above which samples are ignored */
-        unsigned long poll_delay; /* delay (in ms) after pen-down event
-                                     before polling starts */
         unsigned long poll_period; /* time (in ms) between samples */
         int     fuzzx; /* fuzz factor for X, Y and pressure axes */
         int     fuzzy;
         int     fuzzz;
 
-        int     (*get_pendown_state)(void);
-        void    (*clear_penirq)(void);          /* If needed, clear 2nd level
-                                                   interrupt source */
+        int     (*get_pendown_state)(struct device *);
+        /* If needed, clear 2nd level interrupt source */
+        void    (*clear_penirq)(void);
         int     (*init_platform_hw)(void);
         void    (*exit_platform_hw)(void);
 };