Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

Merge sparc bug fixes that didn't make it into v3.9 into
sparc-next.

Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 2 insertions, 3 deletions

diff --git a/include/linux/input/auo-pixcir-ts.h b/include/linux/input/auo-pixcir-ts.h
index 75d4be717714..5049f21928e4 100644
--- a/include/linux/input/auo-pixcir-ts.h
+++ b/include/linux/input/auo-pixcir-ts.h
@@ -43,12 +43,10 @@
  */
 struct auo_pixcir_ts_platdata {
         int gpio_int;
+        int gpio_rst;
 
         int int_setting;
 
-        void (*init_hw)(struct i2c_client *);
-        void (*exit_hw)(struct i2c_client *);
-
         unsigned int x_max;
         unsigned int y_max;
 };
diff --git a/include/linux/input/mt.h b/include/linux/input/mt.h
index 2e86bd0bfba1..1b1dfa80d9ff 100644
--- a/include/linux/input/mt.h
+++ b/include/linux/input/mt.h
@@ -19,6 +19,7 @@
 #define INPUT_MT_DIRECT         0x0002  /* direct device, e.g. touchscreen */
 #define INPUT_MT_DROP_UNUSED    0x0004  /* drop contacts not seen in frame */
 #define INPUT_MT_TRACK          0x0008  /* use in-kernel tracking */
+#define INPUT_MT_SEMI_MT        0x0010  /* semi-mt device, finger count handled manually */
 
 /**
  * struct input_mt_slot - represents the state of an input MT slot