diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 00:24:27 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 00:24:27 +0000 |
commit | b9558d5f86c471a125abf1fb3a3882fb053b1f8c (patch) | |
tree | 707b53ec64e740a7da87d5f36485e3cd9b1c794e /drivers/net/Space.c | |
parent | b3ac367c7a3e6047abe74817db27e34e759f279f (diff) |
Merge with Linux 2.3.41.
Diffstat (limited to 'drivers/net/Space.c')
-rw-r--r-- | drivers/net/Space.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/Space.c b/drivers/net/Space.c index 5425541ca..dc18256ce 100644 --- a/drivers/net/Space.c +++ b/drivers/net/Space.c @@ -573,7 +573,6 @@ static struct net_device eth0_dev = { /* Token-ring device probe */ extern int ibmtr_probe(struct net_device *); extern int olympic_probe(struct net_device *); -extern int tms380tr_probe(struct net_device *); extern int smctr_probe(struct net_device *); static int @@ -586,9 +585,6 @@ trif_probe(struct net_device *dev) #ifdef CONFIG_IBMOL && olympic_probe(dev) #endif -#ifdef CONFIG_SKTR - && tms380tr_probe(dev) -#endif #ifdef CONFIG_SMCTR && smctr_probe(dev) #endif |