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 'for-linus' of git://oss.sgi.com/xfs/xfs
[pandora-kernel.git]
/
include
/
net
/
inet_timewait_sock.h
diff --git
a/include/net/inet_timewait_sock.h
b/include/net/inet_timewait_sock.h
index
17404b5
..
f1a7709
100644
(file)
--- a/
include/net/inet_timewait_sock.h
+++ b/
include/net/inet_timewait_sock.h
@@
-28,7
+28,7
@@
#include <net/tcp_states.h>
#include <net/timewait_sock.h>
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
struct inet_hashinfo;