diff options
| author |   Mike Marshall <hubcap@omnibond.com> | 2017-02-25 11:12:48 -0500 |
|---|---|---|
| committer | Mike Marshall <hubcap@omnibond.com> | 2017-02-25 11:12:48 -0500 |
| commit | e98bdb3059cbf2b1cd4261e126b08429f64466c3 (patch) | |
| tree | e378fc95b495cc6e0e558f247e99bcaa21a6d567 /net/lapb/lapb_out.c | |
| parent | orangefs: fix buffer size mis-match between kernel space and user space. (diff) | |
| parent | Linux 4.10 (diff) | |
| download | wireguard-linux-e98bdb3059cbf2b1cd4261e126b08429f64466c3.tar.xz wireguard-linux-e98bdb3059cbf2b1cd4261e126b08429f64466c3.zip | |
Merge tag 'v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into for-next
Linux 4.10
Diffstat (limited to 'net/lapb/lapb_out.c')
| -rw-r--r-- | net/lapb/lapb_out.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/lapb/lapb_out.c b/net/lapb/lapb_out.c index 482c94d9d958..eda726e22f64 100644 --- a/net/lapb/lapb_out.c +++ b/net/lapb/lapb_out.c @@ -29,7 +29,7 @@ #include <linux/skbuff.h> #include <linux/slab.h> #include <net/sock.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/fcntl.h> #include <linux/mm.h> #include <linux/interrupt.h> |