diff options
| author | obrien <obrien@FreeBSD.org> | 1998-10-05 21:09:21 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 1998-10-05 21:09:21 +0000 |
| commit | d8d9f67c16d41287ef9a765204355bfcf44a24e6 (patch) | |
| tree | fa47f11d960e73ac062abbc3fc825943575bec17 /sys/amd64 | |
| parent | 0b79056d0141f258c5b2f27357a1f63376d461d3 (diff) | |
| download | FreeBSD-src-d8d9f67c16d41287ef9a765204355bfcf44a24e6.zip FreeBSD-src-d8d9f67c16d41287ef9a765204355bfcf44a24e6.tar.gz | |
Undo most of the previous commit.
Diffstat (limited to 'sys/amd64')
| -rw-r--r-- | sys/amd64/amd64/autoconf.c | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c index add16a6..1a70760d 100644 --- a/sys/amd64/amd64/autoconf.c +++ b/sys/amd64/amd64/autoconf.c @@ -101,16 +101,6 @@ #include <sys/bus.h> -#if defined( FFS_ROOT ) && !defined( FFS ) -#error ``options FFS_ROOT'' requires ``options FFS'' -#endif -#if defined( NFS_ROOT ) && !defined( NFS ) -#error ``options NFS_ROOT'' requires ``options NFS'' -#endif -#if defined( CD9660_ROOT ) && !defined( CD9660 ) -#error ``options CD9660_ROOT'' requires ``options CD9660'' -#endif - static void configure __P((void *)); SYSINIT(configure, SI_SUB_CONFIGURE, SI_ORDER_FIRST, configure, NULL) @@ -119,7 +109,7 @@ static void configure_start __P((void)); static int setdumpdev __P((dev_t dev)); static void setroot __P((void)); -#if defined(CD9660_ROOT) +#if defined(CD9660) || defined(CD9660_ROOT) #include <sys/fcntl.h> #include <sys/proc.h> @@ -179,7 +169,7 @@ find_cdrom_root() rootdev = orootdev; return EINVAL; } -#endif /* CD9660_ROOT */ +#endif /* CD9660 || CD9660_ROOT */ extern void xpt_init __P((void)); @@ -320,7 +310,7 @@ cpu_rootconf() * XXX NetBSD has a much cleaner approach to finding root. * XXX We should adopt their code. */ -#if defined(CD9660_ROOT) +#if defined(CD9660) || defined(CD9660_ROOT) if ((boothowto & RB_CDROM)) { if (bootverbose) printf("Considering CD-ROM root f/s.\n"); @@ -357,7 +347,7 @@ cpu_rootconf() mountrootfsname = "nfs"; } #endif /* BOOTP_NFSROOT */ -#if defined(NFS_ROOT) +#if defined(NFS) || defined(NFS_ROOT) if (!mountrootfsname && nfs_diskless_valid) { if (bootverbose) printf("Considering NFS root f/s.\n"); @@ -365,7 +355,7 @@ cpu_rootconf() } #endif /* NFS */ -#if defined(FFS_ROOT) +#if defined(FFS) || defined(FFS_ROOT) if (!mountrootfsname) { mountrootfsname = "ufs"; if (bootverbose) |
