diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-07-26 12:07:15 -0700 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-07-26 12:07:15 -0700 |
commit | 0808882863774ab69066d83f49f511606be024e0 (patch) | |
tree | dc5eaab5db6c18e06025356235b0c9ba02bd7a1d /drivers/input/rmi4/rmi_f12.c | |
parent | e9003c9cfaa17d26991688268b04244adb67ee2b (diff) | |
parent | 0097ff3d5dad1f76c5e1099d849d52509500708c (diff) |
Merge branch 'next' into for-linus
Prepare first round of input updates for 4.8 merge window.
Diffstat (limited to 'drivers/input/rmi4/rmi_f12.c')
-rw-r--r-- | drivers/input/rmi4/rmi_f12.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/rmi4/rmi_f12.c b/drivers/input/rmi4/rmi_f12.c index 88e91559c84e..332c02f0b107 100644 --- 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; |