summaryrefslogtreecommitdiffstats
path: root/drivers/net/Space.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1998-03-18 17:17:51 +0000
committerRalf Baechle <ralf@linux-mips.org>1998-03-18 17:17:51 +0000
commitf1382dc4850bb459d24a81c6cb0ef93ea7bd4a79 (patch)
tree225271a3d5dcd4e9dea5ee393556abd754c964b1 /drivers/net/Space.c
parent135b00fc2e90e605ac2a96b20b0ebd93851a3f89 (diff)
o Merge with Linux 2.1.90.
o Divide L1 cache sizes by 1024 before printing, makes the numbers a bit more credible ...
Diffstat (limited to 'drivers/net/Space.c')
-rw-r--r--drivers/net/Space.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/Space.c b/drivers/net/Space.c
index e5a98378b..9d880aa4d 100644
--- a/drivers/net/Space.c
+++ b/drivers/net/Space.c
@@ -43,6 +43,7 @@
extern int tulip_probe(struct device *dev);
extern int hp100_probe(struct device *dev);
extern int ultra_probe(struct device *dev);
+extern int ultra32_probe(struct device *dev);
extern int ultramca_probe(struct device *dev);
extern int wd_probe(struct device *dev);
extern int el2_probe(struct device *dev);
@@ -135,13 +136,13 @@ __initfunc(static int ethif_probe(struct device *dev))
#endif
#if defined(CONFIG_ULTRA)
&& ultra_probe(dev)
-#if defined(CONFIG_MCA)
+#endif
+#if defined(CONFIG_ULTRAMCA)
&& ultramca_probe(dev)
#endif
#if defined(CONFIG_ULTRA32)
&& ultra32_probe(dev)
#endif
-#endif
#if defined(CONFIG_SMC9194)
&& smc_init(dev)
#endif