diff options
Diffstat (limited to 'sys/alpha')
-rw-r--r-- | sys/alpha/alpha/autoconf.c | 6 | ||||
-rw-r--r-- | sys/alpha/conf/GENERIC | 2 | ||||
-rw-r--r-- | sys/alpha/conf/NOTES | 2 | ||||
-rw-r--r-- | sys/alpha/conf/SIMOS | 2 |
4 files changed, 0 insertions, 12 deletions
diff --git a/sys/alpha/alpha/autoconf.c b/sys/alpha/alpha/autoconf.c index 2bacd25..42696df 100644 --- a/sys/alpha/alpha/autoconf.c +++ b/sys/alpha/alpha/autoconf.c @@ -27,8 +27,6 @@ */ #include "opt_bootp.h" -#include "opt_ffs.h" -#include "opt_cd9660.h" #include "opt_isa.h" #include "opt_nfs.h" #include "opt_nfsroot.h" @@ -219,9 +217,5 @@ cpu_rootconf() #endif rootdevnames[order++] = "nfs:"; #endif - -#if defined(FFS) && defined(FFS_ROOT) - rootdevnames[order++] = "ufs:da0a"; -#endif } SYSINIT(cpu_rootconf, SI_SUB_ROOT_CONF, SI_ORDER_FIRST, cpu_rootconf, NULL) diff --git a/sys/alpha/conf/GENERIC b/sys/alpha/conf/GENERIC index e7fa03a..6340bb2 100644 --- a/sys/alpha/conf/GENERIC +++ b/sys/alpha/conf/GENERIC @@ -51,7 +51,6 @@ options DEC_KN300 # AlphaServer 4100 (Rawhide), 1200 (Tincup) options INET #InterNETworking options INET6 #IPv6 communications protocols options FFS #Berkeley Fast Filesystem -options FFS_ROOT #FFS usable as root device [keep this!] options SOFTUPDATES #Enable FFS soft updates support options MFS #Memory Filesystem options MD_ROOT #MD is a potential root device @@ -59,7 +58,6 @@ options NFS #Network Filesystem options NFS_ROOT #NFS usable as root device options MSDOSFS #MSDOS Filesystem options CD9660 #ISO 9660 Filesystem -options CD9660_ROOT #CD-ROM usable as root device options DEVFS #Device Filesystem options PROCFS #Process filesystem options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] diff --git a/sys/alpha/conf/NOTES b/sys/alpha/conf/NOTES index e7fa03a..6340bb2 100644 --- a/sys/alpha/conf/NOTES +++ b/sys/alpha/conf/NOTES @@ -51,7 +51,6 @@ options DEC_KN300 # AlphaServer 4100 (Rawhide), 1200 (Tincup) options INET #InterNETworking options INET6 #IPv6 communications protocols options FFS #Berkeley Fast Filesystem -options FFS_ROOT #FFS usable as root device [keep this!] options SOFTUPDATES #Enable FFS soft updates support options MFS #Memory Filesystem options MD_ROOT #MD is a potential root device @@ -59,7 +58,6 @@ options NFS #Network Filesystem options NFS_ROOT #NFS usable as root device options MSDOSFS #MSDOS Filesystem options CD9660 #ISO 9660 Filesystem -options CD9660_ROOT #CD-ROM usable as root device options DEVFS #Device Filesystem options PROCFS #Process filesystem options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] diff --git a/sys/alpha/conf/SIMOS b/sys/alpha/conf/SIMOS index 83d9dd2..ec314be 100644 --- a/sys/alpha/conf/SIMOS +++ b/sys/alpha/conf/SIMOS @@ -25,8 +25,6 @@ options FFS #Berkeley Fast Filesystem options NFS #Network Filesystem options MSDOSFS #MSDOS Filesystem options "CD9660" #ISO 9660 Filesystem -options "CD9660_ROOT" #CD-ROM usable as root device -options FFS_ROOT #FFS usable as root device [keep this!] options NFS_ROOT #NFS usable as root device options PROCFS #Process filesystem options "COMPAT_43" #Compatible with BSD 4.3 [KEEP THIS!] |