diff options
| author |   Mark Brown <broonie@kernel.org> | 2017-01-10 16:39:52 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-01-10 16:39:52 +0000 |
| commit | 9c1852b459f04f6309e40d1d167512b0a5598529 (patch) | |
| tree | a74526f1fe3f9826b81327f0b9ba9b98a543f87c /arch/s390/kernel/debug.c | |
| parent | ASoC: samsung: i2s: Provide I2S device for registered clocks (diff) | |
| parent | Linux 4.10-rc1 (diff) | |
| download | linux-dev-9c1852b459f04f6309e40d1d167512b0a5598529.tar.xz linux-dev-9c1852b459f04f6309e40d1d167512b0a5598529.zip | |
Merge tag 'v4.10-rc1' into asoc-samsung
Linux 4.10-rc1
Diffstat (limited to 'arch/s390/kernel/debug.c')
| -rw-r--r-- | arch/s390/kernel/debug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/debug.c b/arch/s390/kernel/debug.c index aa12de72fd47..79f8ae933520 100644 --- a/arch/s390/kernel/debug.c +++ b/arch/s390/kernel/debug.c @@ -19,7 +19,7 @@ #include <linux/ctype.h> #include <linux/string.h> #include <linux/sysctl.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/module.h> #include <linux/init.h> #include <linux/fs.h> |