diff options
| author | Jason Downs <downsj@cvs.openbsd.org> | 1996-10-26 08:07:27 +0000 |
|---|---|---|
| committer | Jason Downs <downsj@cvs.openbsd.org> | 1996-10-26 08:07:27 +0000 |
| commit | a7579fe8f925961e2358fb12d4314206a6a54273 (patch) | |
| tree | 7a7fa09c84833405188b0b89996eb780de8c80f0 /sys/dev/isa/fd.c | |
| parent | 3bdd5fb011e8c665587228a668598deacb2b453a (diff) | |
more move changes
Diffstat (limited to 'sys/dev/isa/fd.c')
| -rw-r--r-- | sys/dev/isa/fd.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c index a0e57c02c16..4a3bd5f9413 100644 --- a/sys/dev/isa/fd.c +++ b/sys/dev/isa/fd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fd.c,v 1.24 1996/10/26 06:22:37 downsj Exp $ */ +/* $OpenBSD: fd.c,v 1.25 1996/10/26 08:07:24 downsj Exp $ */ /* $NetBSD: fd.c,v 1.90 1996/05/12 23:12:03 mycroft Exp $ */ /*- @@ -74,7 +74,6 @@ #include <dev/isa/fdreg.h> #if defined(i386) -#include <dev/ic/mc146818reg.h> /* for NVRAM access */ #include <i386/isa/nvram.h> #endif @@ -276,6 +275,7 @@ fd_nvtotype(fdc, nvraminfo, drive) char *fdc; int nvraminfo, drive; { +#if defined(i386) int type; type = (drive == 0 ? nvraminfo : nvraminfo << 4) & 0xf0; @@ -298,6 +298,9 @@ fd_nvtotype(fdc, nvraminfo, drive) fdc, drive, type); return NULL; } +#else + return NULL; +#endif } __inline struct fd_type * |