diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-01-24 12:37:43 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-01-24 12:37:43 -0800 |
| commit | 0cce284537fb42d9c28b9b31038ffc9b464555f5 (patch) | |
| tree | e7af3b5fe2d04ef6527b5da50851d498ee13184e /drivers/input/input-compat.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/input-compat.c')
| -rw-r--r-- | drivers/input/input-compat.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/input-compat.c b/drivers/input/input-compat.c index d84d20b9cec0..2186f71c9fe5 100644 --- a/drivers/input/input-compat.c +++ b/drivers/input/input-compat.c @@ -9,7 +9,7 @@ */ #include <linux/export.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "input-compat.h" #ifdef CONFIG_COMPAT |