Merge branch 'for-3.8/upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / drivers / input / touchscreen / ili210x.c

diff --git a/drivers/input/touchscreen/ili210x.c b/drivers/input/touchscreen/ili210x.c
index 7e6221c9ea7d5a3df36eaed08674101a1e2687da..1418bdda61bbdde36df38a88eb434be57e3db6ab 100644 (file)
--- a/drivers/input/touchscreen/ili210x.c
+++ b/drivers/input/touchscreen/ili210x.c
@@ -298,7 +298,7 @@ err_free_mem:
        return error;
 }
 
-static int __devexit ili210x_i2c_remove(struct i2c_client *client)
+static int ili210x_i2c_remove(struct i2c_client *client)
 {
        struct ili210x *priv = i2c_get_clientdata(client);