diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-03 08:44:09 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-03 08:44:09 +0200 |
| commit | 129521dcc94f781890f8f668219ab79f0073ff9f (patch) | |
| tree | 9f70707c88da65577f38814fe37b24c4b4957d64 /net/rose/rose_in.c | |
| parent | [ACPI] acpi_video_device_write_state() now works (diff) | |
| parent | Merge refs/heads/ieee80211-wifi from master.kernel.org:/pub/scm/linux/kernel/... (diff) | |
| download | linux-129521dcc94f781890f8f668219ab79f0073ff9f.tar.xz linux-129521dcc94f781890f8f668219ab79f0073ff9f.zip | |
Merge linux-2.6 into linux-acpi-2.6 test
Diffstat (limited to 'net/rose/rose_in.c')
| -rw-r--r-- | net/rose/rose_in.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/rose/rose_in.c b/net/rose/rose_in.c index ef475a1bb1ba..8348d33f1efe 100644 --- a/net/rose/rose_in.c +++ b/net/rose/rose_in.c @@ -26,8 +26,7 @@ #include <linux/netdevice.h> #include <linux/skbuff.h> #include <net/sock.h> -#include <net/ip.h> /* For ip_rcv */ -#include <net/tcp.h> +#include <net/tcp_states.h> #include <asm/system.h> #include <linux/fcntl.h> #include <linux/mm.h> |