diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-28 21:24:32 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-28 21:24:32 -0700 |
commit | a839688362e32f01608838516036697e30618b39 (patch) | |
tree | a174d93d568ba9735b13bb6ebb5f1a36c8f56308 /drivers/net/slip.c | |
parent | 2fa938b8a3964c21b23d9d095091e7abc88249c5 (diff) | |
parent | 12dc2fdd3e6067f5137e4a6d8af0b1a994952f52 (diff) | |
download | blackbird-op-linux-a839688362e32f01608838516036697e30618b39.tar.gz blackbird-op-linux-a839688362e32f01608838516036697e30618b39.zip |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/slip.c')
-rw-r--r-- | drivers/net/slip.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/slip.c b/drivers/net/slip.c index 16363b5c6f56..404ea4297e32 100644 --- a/drivers/net/slip.c +++ b/drivers/net/slip.c @@ -74,6 +74,7 @@ #include <linux/rtnetlink.h> #include <linux/if_arp.h> #include <linux/if_slip.h> +#include <linux/delay.h> #include <linux/init.h> #include "slip.h" #ifdef CONFIG_INET |