diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1998-04-09 07:34:01 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1998-04-09 07:34:01 +0000 |
| commit | e96b962610abab25c480b3f4629eb9c54813172c (patch) | |
| tree | 947d0429420bd5c3f3b08f2c6162c2737263dbaf /sys | |
| parent | ba1142f0e75d8499726db9cc646655a1b51eb927 (diff) | |
From netbsd: detect clock correctly, fix order of zbus probe
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/amiga/amiga/autoconf.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sys/arch/amiga/amiga/autoconf.c b/sys/arch/amiga/amiga/autoconf.c index 5438194c2ea..3a1e9962a4c 100644 --- a/sys/arch/amiga/amiga/autoconf.c +++ b/sys/arch/amiga/amiga/autoconf.c @@ -1,5 +1,5 @@ -/* $OpenBSD: autoconf.c,v 1.11 1997/10/07 10:58:42 niklas Exp $ */ -/* $NetBSD: autoconf.c,v 1.56 1997/08/31 16:33:13 is Exp $ */ +/* $OpenBSD: autoconf.c,v 1.12 1998/04/09 07:34:00 niklas Exp $ */ +/* $NetBSD: autoconf.c,v 1.59 1998/01/15 21:55:51 is Exp $ */ /* * Copyright (c) 1994 Christian E. Hopps @@ -255,12 +255,11 @@ mbattach(pdp, dp, auxp) config_found(dp, "clock", simple_devprint); if (is_a3000() || is_a4000()) { config_found(dp, "a34kbbc", simple_devprint); - } else if ( + } else #ifdef DRACO - !is_draco() && + if (!is_draco()) #endif - !is_a1200()) { - + { config_found(dp, "a2kbbc", simple_devprint); } #ifdef DRACO @@ -284,7 +283,6 @@ mbattach(pdp, dp, auxp) config_found(dp, "idesc", simple_devprint); if (is_a4000()) /* Try to configure A4000T SCSI */ config_found(dp, "afsc", simple_devprint); - config_found(dp, "zbus", simple_devprint); if (is_a3000()) config_found(dp, "ahsc", simple_devprint); #ifdef DRACO @@ -292,6 +290,7 @@ mbattach(pdp, dp, auxp) #endif config_found(dp, "aucc", simple_devprint); + config_found(dp, "zbus", simple_devprint); } int |