git.openpandora.org
/
pandora-kernel.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
[pandora-kernel.git]
/
net
/
core
/
dev.c
diff --git
a/net/core/dev.c
b/net/core/dev.c
index
ea00e36
..
576a615
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"