Move sunkbd defn to common place and remove old event.c reference

3 files changed, 11 insertions, 10 deletions

diff --git a/sys/arch/sparc/conf/files.sparc b/sys/arch/sparc/conf/files.sparc
index d5808db3e42..a2ea5bb83bb 100644
--- a/sys/arch/sparc/conf/files.sparc
+++ b/sys/arch/sparc/conf/files.sparc
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.sparc,v 1.45 2002/09/20 11:17:55 fgsch Exp $
+#	$OpenBSD: files.sparc,v 1.46 2003/01/14 19:56:32 jason Exp $
 #	$NetBSD: files.sparc,v 1.44 1997/08/31 21:29:16 pk Exp $
 
 # @(#)files.sparc	8.1 (Berkeley) 7/19/93
@@ -78,6 +78,9 @@ device sbus { slot = -1, offset = -1 }
 attach sbus at mainbus, iommu, sbus, xbox
 file	arch/sparc/dev/sbus.c			sbus
 
+# Sun specific files
+include "../../../dev/sun/files.sun"
+
 #
 # Console (zs) related stuff
 #
@@ -87,9 +90,6 @@ attach zstty at zs
 file	arch/sparc/dev/z8530tty.c		zstty needs-flag
 file	arch/sparc/dev/zs_kgdb.c		kgdb
 
-define sunkbd
-file	dev/sun/sunkbd.c			sunkbd
-
 device zskbd: tty, wskbddev, sunkbd
 attach zskbd at zs
 file	arch/sparc/dev/z8530kbd.c		zskbd needs-flag
diff --git a/sys/arch/sparc64/conf/files.sparc64 b/sys/arch/sparc64/conf/files.sparc64
index 75ccb3ff635..ccfe24ae2dc 100644
--- a/sys/arch/sparc64/conf/files.sparc64
+++ b/sys/arch/sparc64/conf/files.sparc64
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.sparc64,v 1.41 2002/07/12 10:25:02 miod Exp $
+#	$OpenBSD: files.sparc64,v 1.42 2003/01/14 19:56:32 jason Exp $
 #	$NetBSD: files.sparc64,v 1.50 2001/08/10 20:53:50 eeh Exp $
 
 # maxpartitions must be first item in files.${ARCH}
@@ -41,6 +41,9 @@ include "dev/pcmcia/files.pcmcia"
 include "compat/netbsd/files.netbsd"
 file	arch/sparc64/sparc64/netbsd_machdep.c	compat_netbsd
 
+# Sun specific files
+include "../../../dev/sun/files.sun"
+
 attach sbus at mainbus
 file	arch/sparc64/dev/sbus.c			sbus
 
@@ -126,9 +129,6 @@ file	arch/sparc64/dev/ce4231.c		audioce
 attach com at ebus with com_ebus
 file	arch/sparc64/dev/com_ebus.c		com_ebus
 
-define sunkbd
-file	dev/sun/sunkbd.c			sunkbd
-
 attach pckbc at ebus with pckbc_ebus
 file	arch/sparc64/dev/pckbc_ebus.c		pckbc_ebus
 
diff --git a/sys/dev/sun/files.sun b/sys/dev/sun/files.sun
index a7440281c9e..ae0d3c37137 100644
--- a/sys/dev/sun/files.sun
+++ b/sys/dev/sun/files.sun
@@ -1,6 +1,7 @@
-#	$OpenBSD: files.sun,v 1.1 1997/08/08 08:17:14 downsj Exp $
+#	$OpenBSD: files.sun,v 1.2 2003/01/14 19:56:32 jason Exp $
 # $NetBSD: files.sun,v 1.1 1996/05/29 21:54:34 pk Exp $
 #
 # Configuration file for devices found on Sun machines.
 #
-file dev/sun/event.c
+define	sunkbd
+file	dev/sun/sunkbd.c			sunkbd