diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-12 09:54:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-12 09:54:39 -0700 |
| commit | 6762b47a74264152eeda5ac7516732fe9be265a7 (patch) | |
| tree | 16aee054ebd304c3030faaa030779b6e8d0c25e9 /net/wanrouter/af_wanpipe.c | |
| parent | dcccdd938ef0c5d96145957217b814b14bd46cdc (diff) | |
| parent | 052bb88e180d010f7da7186e6f21eea3be82a903 (diff) | |
| download | kernel_samsung_aries-6762b47a74264152eeda5ac7516732fe9be265a7.zip kernel_samsung_aries-6762b47a74264152eeda5ac7516732fe9be265a7.tar.gz kernel_samsung_aries-6762b47a74264152eeda5ac7516732fe9be265a7.tar.bz2 | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[ISDN]: Static overruns in drivers/isdn/i4l/isdn_ppp.c
[WAN]: Remove broken and unmaintained Sangoma drivers.
[BRIDGE] ebtables: fix allocation in net/bridge/netfilter/ebtables.c
[DCCP]: Fix leak in net/dccp/ipv4.c
[BRIDGE]: receive link-local on disabled ports.
[IPv6] reassembly: Always compute hash under the fragment lock.
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> |