diff options
| author | Jason Downs <downsj@cvs.openbsd.org> | 1996-10-26 06:22:39 +0000 |
|---|---|---|
| committer | Jason Downs <downsj@cvs.openbsd.org> | 1996-10-26 06:22:39 +0000 |
| commit | 3367ebd4bd5e928e05ef4e300da4e319028c37f4 (patch) | |
| tree | 1569b981b63bd2a66a1cd3669d3edca2b869e016 /sys | |
| parent | 80bbc80238a1f5f305143c7dc228195517dbc7ee (diff) | |
move related trivial changes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/isa/fd.c | 8 | ||||
| -rw-r--r-- | sys/dev/isa/fdc.c | 8 | ||||
| -rw-r--r-- | sys/dev/isa/fdreg.h | 1 |
3 files changed, 11 insertions, 6 deletions
diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c index 5ee163888cc..a0e57c02c16 100644 --- a/sys/dev/isa/fd.c +++ b/sys/dev/isa/fd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fd.c,v 1.23 1996/10/16 12:46:22 deraadt Exp $ */ +/* $OpenBSD: fd.c,v 1.24 1996/10/26 06:22:37 downsj Exp $ */ /* $NetBSD: fd.c,v 1.90 1996/05/12 23:12:03 mycroft Exp $ */ /*- @@ -71,12 +71,14 @@ #include <dev/isa/isavar.h> #include <dev/isa/isadmavar.h> -#include <i386/isa/fdreg.h> +#include <dev/isa/fdreg.h> +#if defined(i386) #include <dev/ic/mc146818reg.h> /* for NVRAM access */ #include <i386/isa/nvram.h> +#endif -#include <i386/isa/fdlink.h> +#include <dev/isa/fdlink.h> /* XXX misuse a flag to identify format operation */ #define B_FORMAT B_XXX diff --git a/sys/dev/isa/fdc.c b/sys/dev/isa/fdc.c index f4f6a3102c6..f64205f8701 100644 --- a/sys/dev/isa/fdc.c +++ b/sys/dev/isa/fdc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fdc.c,v 1.2 1996/10/16 12:46:25 deraadt Exp $ */ +/* $OpenBSD: fdc.c,v 1.3 1996/10/26 06:22:38 downsj Exp $ */ /* $NetBSD: fd.c,v 1.90 1996/05/12 23:12:03 mycroft Exp $ */ /*- @@ -70,12 +70,14 @@ #include <dev/isa/isavar.h> #include <dev/isa/isadmavar.h> -#include <i386/isa/fdreg.h> +#include <dev/isa/fdreg.h> +#if defined(i386) #include <dev/ic/mc146818reg.h> /* for NVRAM access */ #include <i386/isa/nvram.h> +#endif -#include <i386/isa/fdlink.h> +#include <dev/isa/fdlink.h> #include "fd.h" diff --git a/sys/dev/isa/fdreg.h b/sys/dev/isa/fdreg.h index 7fa8212ae83..d67d33fd9c3 100644 --- a/sys/dev/isa/fdreg.h +++ b/sys/dev/isa/fdreg.h @@ -1,3 +1,4 @@ +/* $OpenBSD: fdreg.h,v 1.6 1996/10/26 06:22:38 downsj Exp $ */ /* $NetBSD: fdreg.h,v 1.8 1995/06/28 04:30:57 cgd Exp $ */ /*- |