summaryrefslogtreecommitdiff
path: root/sys/arch/sparc64/conf
diff options
context:
space:
mode:
authorSebastian Reitenbach <sebastia@cvs.openbsd.org>2013-04-21 14:44:17 +0000
committerSebastian Reitenbach <sebastia@cvs.openbsd.org>2013-04-21 14:44:17 +0000
commit841c597229f823f724befaf6a10afab3eddc3f95 (patch)
tree23ef87d27e4d747fb797a6f313890d39739364e6 /sys/arch/sparc64/conf
parent387b11b6df84ee8d556ce77a94a3c85a312eadaa (diff)
Unify the zs tty driver.
Most of the hard work by mpi@, who provided the initial diff. Fixes for sparc from myself. Tested on sgi and sparc myself. Compiles and detects zstty on my powerbook, compile tested on sparc64 by me. Real testing with zs device on sparc64 by miod@ who also gave a lot of help and feedback. ok miod@, mpi@
Diffstat (limited to 'sys/arch/sparc64/conf')
-rw-r--r--sys/arch/sparc64/conf/files.sparc646
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/sparc64/conf/files.sparc64 b/sys/arch/sparc64/conf/files.sparc64
index f7e5dd320bc..62f2f9e91fc 100644
--- a/sys/arch/sparc64/conf/files.sparc64
+++ b/sys/arch/sparc64/conf/files.sparc64
@@ -1,4 +1,4 @@
-# $OpenBSD: files.sparc64,v 1.139 2012/12/08 20:38:10 kettenis Exp $
+# $OpenBSD: files.sparc64,v 1.140 2013/04/21 14:44:16 sebastia Exp $
# $NetBSD: files.sparc64,v 1.50 2001/08/10 20:53:50 eeh Exp $
# maxpartitions must be first item in files.${ARCH}
@@ -278,12 +278,12 @@ file arch/sparc64/dev/lpt_ebus.c lpt_ebus
attach zs at sbus with zs_sbus
attach zs at fhc with zs_fhc
file arch/sparc64/dev/zs.c zs needs-flag
-file arch/sparc64/dev/z8530sc.c zs
+file dev/ic/z8530sc.c zs
define zstty {}
device zstty: tty
attach zstty at zs
-file arch/sparc64/dev/z8530tty.c zstty needs-flag
+file dev/ic/z8530tty.c zstty needs-flag
device zskbd: wskbddev, sunkbd
attach zskbd at zs