diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-18 05:39:23 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-18 05:39:23 -0400 |
| commit | 9e73972cef1c0961c78b0e0b61c4ecc275b29f04 (patch) | |
| tree | 27907bbd653504d71ff47cb00bdf8cd61e82f126 /net/wanrouter/af_wanpipe.c | |
| parent | a890b15c0990cc8d686edcc85f5fccde71ad5ce9 (diff) | |
| parent | 4741c336d27dec3ea68a35659abb8dc82b142388 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'net/wanrouter/af_wanpipe.c')
| -rw-r--r-- | net/wanrouter/af_wanpipe.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/wanrouter/af_wanpipe.c b/net/wanrouter/af_wanpipe.c index 8b9bf4a763b5..b1265187b4a8 100644 --- a/net/wanrouter/af_wanpipe.c +++ b/net/wanrouter/af_wanpipe.c | |||
| @@ -55,12 +55,10 @@ | |||
| 55 | #include <asm/uaccess.h> | 55 | #include <asm/uaccess.h> |
| 56 | #include <linux/module.h> | 56 | #include <linux/module.h> |
| 57 | #include <linux/init.h> | 57 | #include <linux/init.h> |
| 58 | #include <linux/wanpipe.h> | ||
| 59 | #include <linux/if_wanpipe.h> | 58 | #include <linux/if_wanpipe.h> |
| 60 | #include <linux/pkt_sched.h> | 59 | #include <linux/pkt_sched.h> |
| 61 | #include <linux/tcp_states.h> | 60 | #include <linux/tcp_states.h> |
| 62 | #include <linux/if_wanpipe_common.h> | 61 | #include <linux/if_wanpipe_common.h> |
| 63 | #include <linux/sdla_x25.h> | ||
| 64 | 62 | ||
| 65 | #ifdef CONFIG_INET | 63 | #ifdef CONFIG_INET |
| 66 | #include <net/inet_common.h> | 64 | #include <net/inet_common.h> |