diff options
| author | Jason Downs <downsj@cvs.openbsd.org> | 1996-11-10 09:49:15 +0000 |
|---|---|---|
| committer | Jason Downs <downsj@cvs.openbsd.org> | 1996-11-10 09:49:15 +0000 |
| commit | 2bd5a4150e2302cad3284aa231347e6510679788 (patch) | |
| tree | 8c3e04a4c2d814edaddf8b722b471140af58d74d /sys | |
| parent | f279190e4c9eca3acd5c281b4c648b51edccc527 (diff) | |
Another change Theo missed, plus some stylistic changes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/i386/i386/autoconf.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sys/arch/i386/i386/autoconf.c b/sys/arch/i386/i386/autoconf.c index 81f4897629a..db1dbbc8b57 100644 --- a/sys/arch/i386/i386/autoconf.c +++ b/sys/arch/i386/i386/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.17 1996/11/06 02:09:39 deraadt Exp $ */ +/* $OpenBSD: autoconf.c,v 1.18 1996/11/10 09:49:14 downsj Exp $ */ /* $NetBSD: autoconf.c,v 1.20 1996/05/03 19:41:56 christos Exp $ */ /*- @@ -206,10 +206,6 @@ setroot() #if NWDC > 0 extern struct cfdriver wd_cd; #endif -#include "fd.h" -#if NFD > 0 -extern struct cfdriver fd_cd; -#endif #include "sd.h" #if NSD > 0 extern struct cfdriver sd_cd; @@ -226,6 +222,10 @@ extern struct cfdriver mcd_cd; #if NACD > 0 extern struct cfdriver acd_cd; #endif +#include "fd.h" +#if NFD > 0 +extern struct cfdriver fd_cd; +#endif struct genericconf { struct cfdriver *gc_driver; @@ -244,12 +244,12 @@ struct genericconf { #if NMCD > 0 { &mcd_cd, "mcd", 7 }, #endif -#if NFDC > 0 - { &fd_cd, "fd", 20 }, -#endif #if NACD > 0 { &acd_cd, "acd", 18 }, #endif +#if NFDC > 0 + { &fd_cd, "fd", 20 }, +#endif { 0 } }; @@ -264,7 +264,7 @@ setconf() char *num; #ifdef INSTALL - if (((bootdev >> B_TYPESHIFT) & B_TYPEMASK) == 2) { + if (((bootdev >> B_TYPESHIFT) & B_TYPEMASK) == 20) { printf("\n\nInsert file system floppy...\n"); if (!(boothowto & RB_ASKNAME)) cngetc(); |