diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-24 11:46:01 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-24 11:46:01 -0800 |
| commit | 7c0f6ba682b9c7632072ffbedf8d328c8f3c42ba (patch) | |
| tree | 0a6e858d2c9e6e8cd7da1d4268972071fbeb77ca /drivers/platform | |
| parent | Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 (diff) | |
| download | linux-dev-7c0f6ba682b9c7632072ffbedf8d328c8f3c42ba.tar.xz linux-dev-7c0f6ba682b9c7632072ffbedf8d328c8f3c42ba.zip | |
Replace <asm/uaccess.h> with <linux/uaccess.h> globally
This was entirely automated, using the script by Al:
PATT='^[[:blank:]]*#[[:blank:]]*include[[:blank:]]*<asm/uaccess.h>'
sed -i -e "s!$PATT!#include <linux/uaccess.h>!" \
$(git grep -l "$PATT"|grep -v ^include/linux/uaccess.h)
to do the replacement at the end of the merge window.
Requested-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/x86/sony-laptop.c | 2 | ||||
| -rw-r--r-- | drivers/platform/x86/thinkpad_acpi.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c index c890a49587e4..aa2ee51d3547 100644 --- a/drivers/platform/x86/sony-laptop.c +++ b/drivers/platform/x86/sony-laptop.c @@ -68,7 +68,7 @@ #include <linux/poll.h> #include <linux/miscdevice.h> #endif -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <acpi/video.h> #define dprintk(fmt, ...) \ diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index aa65a857a6b1..cacb43fb1df7 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c @@ -82,7 +82,7 @@ #include <sound/core.h> #include <sound/control.h> #include <sound/initval.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <acpi/video.h> /* ThinkPad CMOS commands */ |