From 43b448a711566bccdb61233d34f912a29530dab3 Mon Sep 17 00:00:00 2001 From: martin Date: Sun, 2 Nov 2003 10:13:23 +0000 Subject: [PATCH] Redo previous so that it actually works - the OF node still is called "wdc" but it is not the parent but the grandparent of the disk device now. --- sys/arch/shark/shark/shark_machdep.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/arch/shark/shark/shark_machdep.c b/sys/arch/shark/shark/shark_machdep.c index 1bbeb3e2ae1e..407eeabae617 100644 --- a/sys/arch/shark/shark/shark_machdep.c +++ b/sys/arch/shark/shark/shark_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: shark_machdep.c,v 1.17 2003/10/24 10:57:16 is Exp $ */ +/* $NetBSD: shark_machdep.c,v 1.18 2003/11/02 10:13:23 martin Exp $ */ /* * Copyright 1997 @@ -38,7 +38,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: shark_machdep.c,v 1.17 2003/10/24 10:57:16 is Exp $"); +__KERNEL_RCSID(0, "$NetBSD: shark_machdep.c,v 1.18 2003/11/02 10:13:23 martin Exp $"); #include "opt_ddb.h" @@ -429,8 +429,9 @@ ofw_device_register(struct device *dev, void *aux) struct ofisa_attach_args *aa = aux; oba = &aa->oba; #if NWD > 0 || NSD > 0 || NCD > 0 - } else if (parent == dev->dv_parent - && !strcmp(parent->dv_cfdata->cf_name, "atabus")) { + } else if (dev->dv_parent->dv_parent != NULL + && parent == dev->dv_parent->dv_parent + && !strcmp(parent->dv_cfdata->cf_name, "wdc")) { #if NSD > 0 || NCD > 0 if (!strcmp(cd_name, "atapibus")) { scsipidev = dev;