diff --git a/[refs] b/[refs]
index 93e09d974e83..ea31ae4cd47d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 361a2018596604e8e101aa86f296026760a705e1
+refs/heads/master: b18d5dc8257cb2c47dea2e04168d24aea18d55c0
diff --git a/trunk/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c b/trunk/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
index bc7a561b4ad6..299f51810199 100644
--- a/trunk/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
+++ b/trunk/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
@@ -1022,7 +1022,7 @@ static int synaptics_rmi4_probe
  * This function uses to remove the i2c-client
  * touchscreen driver and returns integer.
  */
-static int __devexit synaptics_rmi4_remove(struct i2c_client *client)
+static int synaptics_rmi4_remove(struct i2c_client *client)
 {
 	struct synaptics_rmi4_data *rmi4_data = i2c_get_clientdata(client);
 	const struct synaptics_rmi4_platform_data *pdata = rmi4_data->board;