git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
MIPS: SB1250: Sort out merge mistake.
[safe/jmp/linux-2.6]
/
net
/
core
/
netpoll.c
diff --git
a/net/core/netpoll.c
b/net/core/netpoll.c
index
7ab31a7
..
9675f31
100644
(file)
--- a/
net/core/netpoll.c
+++ b/
net/core/netpoll.c
@@
-24,7
+24,7
@@
#include <net/tcp.h>
#include <net/udp.h>
#include <asm/unaligned.h>
-#include <trace/napi.h>
+#include <trace/
events/
napi.h>
/*
* We maintain a small pool of fully-sized skbs, to make sure the