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 /sound/oss/dmasound/dmasound_paula.c | |
parent | 9b41da80e09128574f09bed8dc5a5fc6f72a8239 (diff) | |
parent | 7ce7d89f48834cefece7804d38fc5d85382edf77 (diff) | |
download | linux-9c1852b459f04f6309e40d1d167512b0a5598529.tar.gz linux-9c1852b459f04f6309e40d1d167512b0a5598529.tar.xz |
Merge tag 'v4.10-rc1' into asoc-samsung
Linux 4.10-rc1
Diffstat (limited to 'sound/oss/dmasound/dmasound_paula.c')
-rw-r--r-- | sound/oss/dmasound/dmasound_paula.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/dmasound/dmasound_paula.c b/sound/oss/dmasound/dmasound_paula.c index 3f653618614d..81eb82c4675a 100644 --- a/sound/oss/dmasound/dmasound_paula.c +++ b/sound/oss/dmasound/dmasound_paula.c @@ -23,7 +23,7 @@ #include <linux/interrupt.h> #include <linux/platform_device.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/setup.h> #include <asm/amigahw.h> #include <asm/amigaints.h> |