From 831e72864e92cc2d96d5e30d09afb9cc73b28638 Mon Sep 17 00:00:00 2001
From: Henrik Rydberg <rydberg@euromail.se>
Date: Thu, 28 Jan 2010 22:28:27 -0800
Subject: [PATCH] --- yaml --- r: 180063 b: refs/heads/master c:
 cb6ecf6f7afece066265e243657b0ac28150a7b2 h: refs/heads/master i:   180061:
 b253375d762cbeafc83809a268865759ae5b4904   180059:
 b8a7d34b6a173a8188ea064c6990fab71fae053e   180055:
 e7d6111d959aa126ef88ed50f2a3fad4057fb0ac   180047:
 ea2331c756e1852cbc55c23f0715988df1a60fae   180031:
 8cc1cab8ec95b118ecc41c34ca2db4f003fbaf34 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/input/input.c | 1 +
 trunk/include/linux/input.h | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ff0a7faa789a..f8d8a1d3c978 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 93fb84b50fe03aabca8d9dea5d3ba521a07e8571
+refs/heads/master: cb6ecf6f7afece066265e243657b0ac28150a7b2
diff --git a/trunk/drivers/input/input.c b/trunk/drivers/input/input.c
index 30b503b8d67b..86cb2d2196ff 100644
--- a/trunk/drivers/input/input.c
+++ b/trunk/drivers/input/input.c
@@ -46,6 +46,7 @@ static unsigned int input_abs_bypass_init_data[] __initdata = {
 	ABS_MT_TOOL_TYPE,
 	ABS_MT_BLOB_ID,
 	ABS_MT_TRACKING_ID,
+	ABS_MT_PRESSURE,
 	0
 };
 static unsigned long input_abs_bypass[BITS_TO_LONGS(ABS_CNT)];
diff --git a/trunk/include/linux/input.h b/trunk/include/linux/input.h
index 7be8a6537b57..735ceaf1bc2d 100644
--- a/trunk/include/linux/input.h
+++ b/trunk/include/linux/input.h
@@ -660,6 +660,7 @@ struct input_absinfo {
 #define ABS_MT_TOOL_TYPE	0x37	/* Type of touching device */
 #define ABS_MT_BLOB_ID		0x38	/* Group a set of packets as a blob */
 #define ABS_MT_TRACKING_ID	0x39	/* Unique ID of initiated contact */
+#define ABS_MT_PRESSURE		0x3a	/* Pressure on contact area */
 
 #define ABS_MAX			0x3f
 #define ABS_CNT			(ABS_MAX+1)