summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFederico G. Schwindt <fgsch@cvs.openbsd.org>2001-09-11 06:06:16 +0000
committerFederico G. Schwindt <fgsch@cvs.openbsd.org>2001-09-11 06:06:16 +0000
commit14fffdcf78546fd66d49fa506f966168d56185c2 (patch)
treea49b143d911a491591be571ebef5658b6cb72f6d
parent235c7fe7b929a17138cb15a12da434f3408e1a9e (diff)
remove acd references; millert@ ok.
-rw-r--r--distrib/notes/m4.common8
-rw-r--r--sys/arch/hppa/conf/GENERIC3
-rw-r--r--sys/arch/i386/stand/libsa/dev_i386.c4
3 files changed, 7 insertions, 8 deletions
diff --git a/distrib/notes/m4.common b/distrib/notes/m4.common
index 91af1a1e1c0..bb0b1a9ae37 100644
--- a/distrib/notes/m4.common
+++ b/distrib/notes/m4.common
@@ -1,5 +1,5 @@
dnl
-dnl $OpenBSD: m4.common,v 1.14 2001/08/22 18:27:42 miod Exp $
+dnl $OpenBSD: m4.common,v 1.15 2001/09/11 06:06:15 fgsch Exp $
dnl
dnl simulate an include path with a macro 'includeit'.
define(`includeit',`sinclude('INCLUDE/`$1)sinclude('INCLUDE/../`$1)')dnl
@@ -338,9 +338,9 @@ define({:-OpenBSDCDROMInstall-:},
{:- To install from CD-ROM:
When installing from a CD-ROM, you will be asked which
device holds the distribution sets. This will typically
- be either "cd0" or "acd0". Next you will be asked which
- partition on the CD-ROM the distribution is to be loaded
- from. This is normally partition "a".
+ be "cd0". Next you will be asked which partition on the
+ CD-ROM the distribution is to be loaded from. This is
+ normally partition "a".
Next you will have to identify the file system type that
has been used to create the distribution on the CD-ROM,
diff --git a/sys/arch/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC
index d55eb8262be..a90073af5a7 100644
--- a/sys/arch/hppa/conf/GENERIC
+++ b/sys/arch/hppa/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.10 2001/03/08 03:37:17 itojun Exp $
+# $OpenBSD: GENERIC,v 1.11 2001/09/11 06:06:15 fgsch Exp $
#
# Generic kernel config (all that is supportted)
#
@@ -14,7 +14,6 @@ config bsd swap generic
#atapibus* at wdc?
#wd* at wdc? drive ?
-#acd* at atapibus? drive ?
sd* at scsibus? target ? lun ?
#cd* at scsibus? target ? lun ?
diff --git a/sys/arch/i386/stand/libsa/dev_i386.c b/sys/arch/i386/stand/libsa/dev_i386.c
index 48fa458b549..86817886fcc 100644
--- a/sys/arch/i386/stand/libsa/dev_i386.c
+++ b/sys/arch/i386/stand/libsa/dev_i386.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dev_i386.c,v 1.23 2000/06/08 01:51:32 mickey Exp $ */
+/* $OpenBSD: dev_i386.c,v 1.24 2001/09/11 06:06:15 fgsch Exp $ */
/*
* Copyright (c) 1996-1999 Michael Shalayeff
@@ -41,7 +41,7 @@ extern int debug;
/* XXX use slot for 'rd' for 'hd' pseudo-device */
const char bdevs[][4] = {
"wd", "", "fd", "wt", "sd", "st", "cd", "mcd",
- "", "", "", "", "", "", "", "scd", "", "hd", "acd"
+ "", "", "", "", "", "", "", "scd", "", "hd", ""
};
const int nbdevs = NENTS(bdevs);