From 1865f53cc4320c85b9bf06190c6c8edf56f215ef Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Mon, 19 Nov 2012 13:21:33 -0500
Subject: [PATCH] --- yaml --- r: 338106 b: refs/heads/master c:
 3cf36aa9951828a6c164f3b3e12d4653af8ba69f h: refs/heads/master v: v3

---
 [refs]                                              | 2 +-
 trunk/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7b77df669d60..34094984bc33 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c8ddc220177c9b0aa3207f872ef3401c16da9d6d
+refs/heads/master: 3cf36aa9951828a6c164f3b3e12d4653af8ba69f
diff --git a/trunk/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c b/trunk/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
index c71366d3deec..0b717275f10c 100644
--- a/trunk/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
+++ b/trunk/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
@@ -1130,7 +1130,7 @@ static struct i2c_driver synaptics_rmi4_driver = {
 #endif
 	},
 	.probe		=	synaptics_rmi4_probe,
-	.remove		=	__devexit_p(synaptics_rmi4_remove),
+	.remove		=	synaptics_rmi4_remove,
 	.id_table	=	synaptics_rmi4_id_table,
 };