git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge back earlier ACPICA changes for v4.11.
[sfrench/cifs-2.6.git]
/
net
/
xfrm
/
xfrm_user.c
diff --git
a/net/xfrm/xfrm_user.c
b/net/xfrm/xfrm_user.c
index 671a1d0333f0d2c828c757944016cbe48836ec72..9705c279494b248b759155d671cfbc778fa25058 100644
(file)
--- a/
net/xfrm/xfrm_user.c
+++ b/
net/xfrm/xfrm_user.c
@@
-27,7
+27,7
@@
#include <net/xfrm.h>
#include <net/netlink.h>
#include <net/ah.h>
-#include <
asm
/uaccess.h>
+#include <
linux
/uaccess.h>
#if IS_ENABLED(CONFIG_IPV6)
#include <linux/in6.h>
#endif