diff options
author | Dale S. Rahn <rahnds@cvs.openbsd.org> | 1999-10-28 04:25:26 +0000 |
---|---|---|
committer | Dale S. Rahn <rahnds@cvs.openbsd.org> | 1999-10-28 04:25:26 +0000 |
commit | 23c4731f334c11b77c6bcf062ff2e7e6b3cf2c4e (patch) | |
tree | db0aac6190d7fce7353bfdbf4d20c7e8f4683eeb /sys/dev/ofw/ofbus.c | |
parent | cacce03b3f7cb6f9a8d302e7c03b0ce00be68e76 (diff) |
Sync up with some piece of reality, start supporting powerpc again.
Diffstat (limited to 'sys/dev/ofw/ofbus.c')
-rw-r--r-- | sys/dev/ofw/ofbus.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/dev/ofw/ofbus.c b/sys/dev/ofw/ofbus.c index fceaae1b837..41e3fec1c84 100644 --- a/sys/dev/ofw/ofbus.c +++ b/sys/dev/ofw/ofbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ofbus.c,v 1.5 1998/09/20 23:03:03 rahnds Exp $ */ +/* $OpenBSD: ofbus.c,v 1.6 1999/10/28 04:25:25 rahnds Exp $ */ /* $NetBSD: ofbus.c,v 1.3 1996/10/13 01:38:11 christos Exp $ */ /* @@ -40,7 +40,6 @@ /* a bit of a hack to prevent conflicts between ofdisk and sd/wd */ #include "sd.h" -#include "wd.h" int ofrprobe __P((struct device *, void *, void *)); void ofrattach __P((struct device *, struct device *, void *)); @@ -187,9 +186,9 @@ ofbattach(parent, dev, aux) units = 7; /* What about wide or hostid != 7? XXX */ #endif } else if (!strcmp(name, "ide")) { -#if NWD > 0 - units = 0; /* if wd driver in kernel, dont use ofw */ -else +#if NSD > 0 + units = 0; /* if sd? driver in kernel, dont use ofw */ +#else units = 2; #endif } |