diff options
author | Steve French <sfrench@us.ibm.com> | 2005-08-30 14:33:26 -0400 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2005-08-30 14:33:26 -0400 |
commit | 2016ef789a9ded2e169ad1c028ae3deb5302571f (patch) | |
tree | 601359f15b42d4d9868b4eadfe909a7bef6435c5 /net/wanrouter/af_wanpipe.c | |
parent | 7f57356b70dda014ef269135942426e4a852023e (diff) | |
parent | 6b39374a27eb4be7e9d82145ae270ba02ea90dc8 (diff) |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'net/wanrouter/af_wanpipe.c')
-rw-r--r-- | net/wanrouter/af_wanpipe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wanrouter/af_wanpipe.c b/net/wanrouter/af_wanpipe.c index d93b19faaab7..596cb96e5f47 100644 --- a/net/wanrouter/af_wanpipe.c +++ b/net/wanrouter/af_wanpipe.c | |||
@@ -57,7 +57,7 @@ | |||
57 | #include <linux/wanpipe.h> | 57 | #include <linux/wanpipe.h> |
58 | #include <linux/if_wanpipe.h> | 58 | #include <linux/if_wanpipe.h> |
59 | #include <linux/pkt_sched.h> | 59 | #include <linux/pkt_sched.h> |
60 | #include <linux/tcp.h> | 60 | #include <linux/tcp_states.h> |
61 | #include <linux/if_wanpipe_common.h> | 61 | #include <linux/if_wanpipe_common.h> |
62 | #include <linux/sdla_x25.h> | 62 | #include <linux/sdla_x25.h> |
63 | 63 | ||