diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-24 08:41:41 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-24 13:07:53 -0400 |
| commit | 816724e65c72a90a44fbad0ef0b59b186c85fa90 (patch) | |
| tree | 421fa29aedff988e392f92780637553e275d37a0 /include/linux/tcp.h | |
| parent | 70ac4385a13f78bc478f26d317511893741b05bd (diff) | |
| parent | d384ea691fe4ea8c2dd5b9b8d9042eb181776f18 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
fs/nfs/inode.c
fs/super.c
Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch
'VFS: Permit filesystem to override root dentry on mount'
Diffstat (limited to 'include/linux/tcp.h')
| -rw-r--r-- | include/linux/tcp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/tcp.h b/include/linux/tcp.h index 420a689c3fb4..8ebf497907f8 100644 --- a/include/linux/tcp.h +++ b/include/linux/tcp.h | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #define _LINUX_TCP_H | 18 | #define _LINUX_TCP_H |
| 19 | 19 | ||
| 20 | #include <linux/types.h> | 20 | #include <linux/types.h> |
| 21 | #include <linux/dmaengine.h> | ||
| 22 | #include <asm/byteorder.h> | 21 | #include <asm/byteorder.h> |
| 23 | 22 | ||
| 24 | struct tcphdr { | 23 | struct tcphdr { |
| @@ -161,6 +160,7 @@ struct tcp_info | |||
| 161 | #ifdef __KERNEL__ | 160 | #ifdef __KERNEL__ |
| 162 | 161 | ||
| 163 | #include <linux/skbuff.h> | 162 | #include <linux/skbuff.h> |
| 163 | #include <linux/dmaengine.h> | ||
| 164 | #include <net/sock.h> | 164 | #include <net/sock.h> |
| 165 | #include <net/inet_connection_sock.h> | 165 | #include <net/inet_connection_sock.h> |
| 166 | #include <net/inet_timewait_sock.h> | 166 | #include <net/inet_timewait_sock.h> |