diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-03 02:44:09 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-03 02:44:09 -0400 |
| commit | 129521dcc94f781890f8f668219ab79f0073ff9f (patch) | |
| tree | 9f70707c88da65577f38814fe37b24c4b4957d64 /net/rose/rose_timer.c | |
| parent | 824b558bbe2c298b165cdb54c33718994dda30bb (diff) | |
| parent | f505380ba7b98ec97bf25300c2a58aeae903530b (diff) | |
Merge linux-2.6 into linux-acpi-2.6 test
Diffstat (limited to 'net/rose/rose_timer.c')
| -rw-r--r-- | net/rose/rose_timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rose/rose_timer.c b/net/rose/rose_timer.c index 84dd4403f792..50ae0371dab8 100644 --- a/net/rose/rose_timer.c +++ b/net/rose/rose_timer.c | |||
| @@ -22,7 +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 <asm/system.h> | 26 | #include <asm/system.h> |
| 27 | #include <linux/fcntl.h> | 27 | #include <linux/fcntl.h> |
| 28 | #include <linux/mm.h> | 28 | #include <linux/mm.h> |