diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-04-17 15:35:18 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-04-17 15:35:18 +0100 |
| commit | 94171db1d2f23c22b6050d210b72db3bb2f0b81e (patch) | |
| tree | 2318d487807e9f7393fcd46ef0090a27b4ad7981 /net/wanrouter/af_wanpipe.c | |
| parent | d96fb997c6174f98a2a0a98200f99ac13b053bd6 (diff) | |
| parent | c19f7a9e1ac45b57375d51f033b02deca50f4d3f (diff) | |
| download | op-kernel-dev-94171db1d2f23c22b6050d210b72db3bb2f0b81e.zip op-kernel-dev-94171db1d2f23c22b6050d210b72db3bb2f0b81e.tar.gz | |
Merge with git://git.kernel.org/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, 0 insertions, 2 deletions
diff --git a/net/wanrouter/af_wanpipe.c b/net/wanrouter/af_wanpipe.c index 8b9bf4a..b126518 100644 --- a/net/wanrouter/af_wanpipe.c +++ b/net/wanrouter/af_wanpipe.c @@ -55,12 +55,10 @@ #include <asm/uaccess.h> #include <linux/module.h> #include <linux/init.h> -#include <linux/wanpipe.h> #include <linux/if_wanpipe.h> #include <linux/pkt_sched.h> #include <linux/tcp_states.h> #include <linux/if_wanpipe_common.h> -#include <linux/sdla_x25.h> #ifdef CONFIG_INET #include <net/inet_common.h> |
