diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-01-24 15:37:43 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-01-24 15:37:43 -0500 |
| commit | 0cce284537fb42d9c28b9b31038ffc9b464555f5 (patch) | |
| tree | e7af3b5fe2d04ef6527b5da50851d498ee13184e /drivers/input/mouse/trackpoint.c | |
| parent | cefb26d4b37c329f624eb235a1bdc7b6b8dd9430 (diff) | |
| parent | 7a308bb3016f57e5be11a677d15b821536419d36 (diff) | |
Merge tag 'v4.10-rc5' into next
Sync up with mainline to bring up improvements in various subsystems.
Diffstat (limited to 'drivers/input/mouse/trackpoint.c')
| -rw-r--r-- | drivers/input/mouse/trackpoint.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/mouse/trackpoint.c b/drivers/input/mouse/trackpoint.c index 75ed6df49738..922ea02edcc3 100644 --- a/drivers/input/mouse/trackpoint.c +++ b/drivers/input/mouse/trackpoint.c | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | #include <linux/input.h> | 15 | #include <linux/input.h> |
| 16 | #include <linux/libps2.h> | 16 | #include <linux/libps2.h> |
| 17 | #include <linux/proc_fs.h> | 17 | #include <linux/proc_fs.h> |
| 18 | #include <asm/uaccess.h> | 18 | #include <linux/uaccess.h> |
| 19 | #include "psmouse.h" | 19 | #include "psmouse.h" |
| 20 | #include "trackpoint.h" | 20 | #include "trackpoint.h" |
| 21 | 21 | ||