summaryrefslogtreecommitdiff
path: root/sys/arch/alpha/conf/GENERIC
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1999-01-08 03:16:17 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1999-01-08 03:16:17 +0000
commitad2229181528c548830bb38d329e9a7a8fa652d5 (patch)
tree4a3f48cb2e56c19d9cd8a1184ebfc489e4bc4cd0 /sys/arch/alpha/conf/GENERIC
parentdad4eff1f7fe223f168c88f9873e5ddb32f74884 (diff)
s/pcppi/pckbc/ due to conflict with "real" pcppi and as a step towards
sys/dev/pckbc. Will probably still not coexist with pcppi but now alpha at least configs. I will come back here anyday and improve.
Diffstat (limited to 'sys/arch/alpha/conf/GENERIC')
-rw-r--r--sys/arch/alpha/conf/GENERIC10
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index 237a13a0566..35827a30483 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.36 1998/12/28 03:50:37 jason Exp $
+# $OpenBSD: GENERIC,v 1.37 1999/01/08 03:16:15 niklas Exp $
# $NetBSD: GENERIC,v 1.31 1996/12/03 17:25:29 cgd Exp $
#
# Generic Alpha kernel. Enough to get booted, etc., but not much more.
@@ -101,9 +101,11 @@ isa* at sio?
# ISA devices
mcclock* at isa? port 0x70
-pcppi* at isa? # PC prog. periph. interface
-pckbd* at pcppi? # PC keyboard (kbd port)
-pms* at pcppi? # PS/2-style mouse (aux port)
+#pcppi* at isa? # PC prog. periph. interface
+#spkr0 at pcppi?
+pckbc* at isa? # PC keyboard controller
+pckbd* at pckbc? # PC keyboard (kbd port)
+pms* at pckbc? # PS/2-style mouse (aux port)
com* at isa? port 0x3f8 irq 4 # standard serial ports
com* at isa? port 0x2f8 irq 3
lpt* at isa? port 0x3bc irq 7 # standard parallel port