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
/
drop_monitor.c
diff --git
a/net/core/drop_monitor.c
b/net/core/drop_monitor.c
index
a6c2ac2
..
9d66fa9
100644
(file)
--- a/
net/core/drop_monitor.c
+++ b/
net/core/drop_monitor.c
@@
-24,8
+24,8
@@
#include <net/genetlink.h>
#include <net/netevent.h>
-#include <trace/skb.h>
-#include <trace/napi.h>
+#include <trace/
events/
skb.h>
+#include <trace/
events/
napi.h>
#include <asm/unaligned.h>