Merge branch 'next' into for-linus

Prepare first set of updates for 3.8 merge window.

1 files changed, 2 insertions, 8 deletions

diff --git a/include/linux/input/bu21013.h b/include/linux/input/bu21013.h
index 05e03284b92a..6230d76bde5d 100644
--- a/include/linux/input/bu21013.h
+++ b/include/linux/input/bu21013.h
@@ -9,13 +9,10 @@
 
 /**
  * struct bu21013_platform_device - Handle the platform data
- * @cs_en:      pointer to the cs enable function
- * @cs_dis:     pointer to the cs disable function
- * @irq_read_val:    pointer to read the pen irq value function
  * @touch_x_max: touch x max
  * @touch_y_max: touch y max
  * @cs_pin: chip select pin
- * @irq: irq pin
+ * @touch_pin: touch gpio pin
  * @ext_clk: external clock flag
  * @x_flip: x flip flag
  * @y_flip: y flip flag
@@ -24,13 +21,10 @@
  * This is used to handle the platform data
  */
 struct bu21013_platform_device {
-        int (*cs_en)(int reset_pin);
-        int (*cs_dis)(int reset_pin);
-        int (*irq_read_val)(void);
         int touch_x_max;
         int touch_y_max;
         unsigned int cs_pin;
-        unsigned int irq;
+        unsigned int touch_pin;
         bool ext_clk;
         bool x_flip;
         bool y_flip;