diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:43:49 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:43:49 -0400 |
| commit | 1d6ae775d7a948c9575658eb41184fd2e506c0df (patch) | |
| tree | 8128a28e89d82f13bb8e3a2160382240c66e2816 /net/netrom/nr_in.c | |
| parent | 739cdbf1d8f0739b80035b80d69d871e33749b86 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'net/netrom/nr_in.c')
| -rw-r--r-- | net/netrom/nr_in.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/netrom/nr_in.c b/net/netrom/nr_in.c index 9c44b3794126..64b81a796907 100644 --- a/net/netrom/nr_in.c +++ b/net/netrom/nr_in.c | |||
| @@ -22,8 +22,7 @@ | |||
| 22 | #include <linux/netdevice.h> | 22 | #include <linux/netdevice.h> |
| 23 | #include <linux/skbuff.h> | 23 | #include <linux/skbuff.h> |
| 24 | #include <net/sock.h> | 24 | #include <net/sock.h> |
| 25 | #include <net/tcp.h> | 25 | #include <net/tcp_states.h> |
| 26 | #include <net/ip.h> /* For ip_rcv */ | ||
| 27 | #include <asm/uaccess.h> | 26 | #include <asm/uaccess.h> |
| 28 | #include <asm/system.h> | 27 | #include <asm/system.h> |
| 29 | #include <linux/fcntl.h> | 28 | #include <linux/fcntl.h> |