summaryrefslogtreecommitdiff
path: root/linux/dev/drivers/net/Space.c
diff options
context:
space:
mode:
authorThomas Bushnell <thomas@gnu.org>1999-06-16 18:23:12 +0000
committerThomas Bushnell <thomas@gnu.org>1999-06-16 18:23:12 +0000
commita86b6d57a823c221e25df8619a5af67aa38a4cf1 (patch)
tree24508aabcdd403e4b9d6b69c2407288e18358350 /linux/dev/drivers/net/Space.c
parentb63e4633d595916c832d7fae95866105b6ff56c0 (diff)
1999-06-16 Thomas Bushnell, BSG <tb@mit.edu>
* linux/dev/drivers/net/Space.c (ethif_probe): Probe tc59x_probe (CONFIG_VORTEX) after el3_probe (CONFIG_EL3), because the latter card matches the former probe, but the driver doesn't work with it. Reported by Marcus Brinkmann <brinkmd@debian.org>.
Diffstat (limited to 'linux/dev/drivers/net/Space.c')
-rw-r--r--linux/dev/drivers/net/Space.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/dev/drivers/net/Space.c b/linux/dev/drivers/net/Space.c
index 2347ae9..e35b77a 100644
--- a/linux/dev/drivers/net/Space.c
+++ b/linux/dev/drivers/net/Space.c
@@ -131,9 +131,6 @@ ethif_probe(struct device *dev)
#ifdef CONFIG_VIA_RHINE
&& via_rhine_probe(dev)
#endif
-#if defined(CONFIG_VORTEX)
- && tc59x_probe(dev)
-#endif
#if defined(CONFIG_DEC_ELCP)
&& tulip_probe(dev)
#endif
@@ -190,6 +187,9 @@ ethif_probe(struct device *dev)
#ifdef CONFIG_EL3 /* 3c509 */
&& el3_probe(dev)
#endif
+#if defined(CONFIG_VORTEX)
+ && tc59x_probe(dev)
+#endif
#ifdef CONFIG_3C515 /* 3c515 */
&& tc515_probe(dev)
#endif