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
[PATCH] intelfb: extend partial support of i915G to include i915GM
[safe/jmp/linux-2.6]
/
net
/
x25
/
x25_timer.c
diff --git
a/net/x25/x25_timer.c
b/net/x25/x25_timer.c
index
d6a21a3
..
0a92e1d
100644
(file)
--- a/
net/x25/x25_timer.c
+++ b/
net/x25/x25_timer.c
@@
-23,7
+23,7
@@
#include <linux/jiffies.h>
#include <linux/timer.h>
#include <net/sock.h>
#include <linux/jiffies.h>
#include <linux/timer.h>
#include <net/sock.h>
-#include <net/tcp.h>
+#include <net/tcp
_states
.h>
#include <net/x25.h>
static void x25_heartbeat_expiry(unsigned long);
#include <net/x25.h>
static void x25_heartbeat_expiry(unsigned long);