diff options
author | 2017-01-10 16:39:52 +0000 | |
---|---|---|
committer | 2017-01-10 16:39:52 +0000 | |
commit | 9c1852b459f04f6309e40d1d167512b0a5598529 (patch) | |
tree | a74526f1fe3f9826b81327f0b9ba9b98a543f87c /mm/util.c | |
parent | ASoC: samsung: i2s: Provide I2S device for registered clocks (diff) | |
parent | Linux 4.10-rc1 (diff) | |
download | wireguard-linux-9c1852b459f04f6309e40d1d167512b0a5598529.tar.xz wireguard-linux-9c1852b459f04f6309e40d1d167512b0a5598529.zip |
Merge tag 'v4.10-rc1' into asoc-samsung
Linux 4.10-rc1
Diffstat (limited to '')
-rw-r--r-- | mm/util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/util.c b/mm/util.c index 1a41553db866..3cb2164f4099 100644 --- a/mm/util.c +++ b/mm/util.c @@ -13,7 +13,7 @@ #include <linux/vmalloc.h> #include <asm/sections.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "internal.h" |