Merge branch 'next' into for-linus

[sfrench/cifs-2.6.git] / drivers / input / rmi4 / rmi_f12.c

diff --git a/drivers/input/rmi4/rmi_f12.c b/drivers/input/rmi4/rmi_f12.c
index 88e91559c84e2dcad267a0e20fd4e65bc56238bb..332c02f0b107c02f1ae5f5a404ed13b5ee39885d 100644 (file)
--- a/drivers/input/rmi4/rmi_f12.c
+++ b/drivers/input/rmi4/rmi_f12.c
@@ -27,7 +27,6 @@ enum rmi_f12_object_type {
 };
 
 struct f12_data {
-       struct rmi_function *fn;
        struct rmi_2d_sensor sensor;
        struct rmi_2d_sensor_platform_data sensor_pdata;