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 branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
[linux-2.6-block.git]
/
net
/
core
/
dev.c
diff --git
a/net/core/dev.c
b/net/core/dev.c
index ea00e36f48e175c51c30c0b94f253f16f5be0989..576a61574a936fcab9a7608d2d83c677127aebb6 100644
(file)
--- a/
net/core/dev.c
+++ b/
net/core/dev.c
@@
-126,7
+126,7
@@
#include <linux/in.h>
#include <linux/jhash.h>
#include <linux/random.h>
-#include <trace/napi.h>
+#include <trace/
events/
napi.h>
#include "net-sysfs.h"