diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-10-05 01:18:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-10-05 01:18:40 +0000 |
| commit | 012bb3e61e5eced6c610f9e036372bf0c8def2d1 (patch) | |
| tree | 87efc733f9b164e8c85c0336f92c8fb7eff6d183 /drivers/net/Space.c | |
| parent | 625a1589d3d6464b5d90b8a0918789e3afffd220 (diff) | |
Merge with Linux 2.4.0-test9. Please check DECstation, I had a number
of rejects to fixup while integrating Linus patches. I also found
that this kernel will only boot SMP on Origin; the UP kernel freeze
soon after bootup with SCSI timeout messages. I commit this anyway
since I found that the last CVS versions had the same problem.
Diffstat (limited to 'drivers/net/Space.c')
| -rw-r--r-- | drivers/net/Space.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/net/Space.c b/drivers/net/Space.c index 5a64da542..1f4e08936 100644 --- a/drivers/net/Space.c +++ b/drivers/net/Space.c @@ -440,7 +440,7 @@ static int __init fddiif_probe(struct net_device *dev) #endif -/* Pad device name to IFNAMSIZ=16. F.e. __PAD6 is tring of 9 zeros. */ +/* Pad device name to IFNAMSIZ=16. F.e. __PAD6 is string of 9 zeros. */ #define __PAD6 "\0\0\0\0\0\0\0\0\0" #define __PAD5 __PAD6 "\0" #define __PAD4 __PAD5 "\0" @@ -678,14 +678,6 @@ static struct net_device tr0_dev = { #define NEXT_DEV (&escon0_dev) #endif -#ifdef CONFIG_TUN - extern int tun_init(struct net_device *dev); - static struct net_device tun_dev = { - "tun", 0, 0, 0, 0, 0, 0, 0, 0, 0, NEXT_DEV, tun_init }; -# undef NEXT_DEV -# define NEXT_DEV (&tun_dev) -#endif - /* * The loopback device is global so it can be directly referenced * by the network code. Also, it must be first on device list. |