summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorJason Wright <jason@cvs.openbsd.org>2002-11-20 04:26:45 +0000
committerJason Wright <jason@cvs.openbsd.org>2002-11-20 04:26:45 +0000
commit2858299ded453435749cfb9471246245a356b39d (patch)
treeb2ec230fa93edcc345d692468da692253febbed6 /sys
parent4faed12541c7046d8c8f8ced2d1779765161b6ac (diff)
You know why I love Sun? Consistency... deal with another weirdo root
device selection situation (IDE disk controllers on the AX).
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/sparc64/sparc64/autoconf.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/sys/arch/sparc64/sparc64/autoconf.c b/sys/arch/sparc64/sparc64/autoconf.c
index 9f547db8573..6daa9e3f151 100644
--- a/sys/arch/sparc64/sparc64/autoconf.c
+++ b/sys/arch/sparc64/sparc64/autoconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: autoconf.c,v 1.28 2002/11/13 19:41:53 jason Exp $ */
+/* $OpenBSD: autoconf.c,v 1.29 2002/11/20 04:26:44 jason Exp $ */
/* $NetBSD: autoconf.c,v 1.51 2001/07/24 19:32:11 eeh Exp $ */
/*
@@ -1576,10 +1576,13 @@ device_register(dev, aux)
if (strcmp(bp->name, "ide") == 0 &&
strcmp((bp + 1)->name, "ata") == 0 &&
strcmp((bp + 2)->name, "cmdk") == 0) {
- if (((bp + 2)->val[0] == (bp + 1)->val[0]) &&
- ((bp + 1)->val[1] == 0)) {
+ if ((bp + 2)->val[1] == 0 &&
+ (bp + 1)->val[1] == 0) {
(bp + 1)->dev = dev;
bootpath_store(1, bp + 2);
+ (bp + 2)->val[0] +=
+ 2 * ((bp + 1)->val[0]);
+ (bp + 2)->val[1] = 0;
}
}
return;