diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-24 20:46:01 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-24 20:46:01 +0100 |
| commit | 7c0f6ba682b9c7632072ffbedf8d328c8f3c42ba (patch) | |
| tree | 0a6e858d2c9e6e8cd7da1d4268972071fbeb77ca /drivers/char/mwave | |
| parent | Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 (diff) | |
| download | linux-7c0f6ba682b9c7632072ffbedf8d328c8f3c42ba.tar.xz linux-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/char/mwave')
| -rw-r--r-- | drivers/char/mwave/3780i.c | 2 | ||||
| -rw-r--r-- | drivers/char/mwave/mwavedd.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/mwave/3780i.c b/drivers/char/mwave/3780i.c index 972c40a19629..4a8937f80570 100644 --- a/drivers/char/mwave/3780i.c +++ b/drivers/char/mwave/3780i.c @@ -54,7 +54,7 @@ #include <linux/sched.h> /* cond_resched() */ #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/irq.h> #include "smapi.h" #include "mwavedd.h" diff --git a/drivers/char/mwave/mwavedd.h b/drivers/char/mwave/mwavedd.h index 37e0a4926080..21cb09c7bed7 100644 --- a/drivers/char/mwave/mwavedd.h +++ b/drivers/char/mwave/mwavedd.h @@ -53,7 +53,7 @@ #include "smapi.h" #include "mwavepub.h" #include <linux/ioctl.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/wait.h> extern int mwave_debug; |