projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
[linux-2.6-block.git]
/
net
/
bridge
/
br_device.c
diff --git
a/net/bridge/br_device.c
b/net/bridge/br_device.c
index bca5ead3e97324a895d48aba64b321ede593caa2..ed3b3192fb00f575d9d52671ead28de03806002e 100644
(file)
--- a/
net/bridge/br_device.c
+++ b/
net/bridge/br_device.c
@@
-19,7
+19,7
@@
#include <linux/list.h>
#include <linux/netfilter_bridge.h>
-#include <
asm
/uaccess.h>
+#include <
linux
/uaccess.h>
#include "br_private.h"
#define COMMON_FEATURES (NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_HIGHDMA | \