summaryrefslogtreecommitdiff
path: root/sys/arch/i386/conf/files.i386
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/i386/conf/files.i386')
-rw-r--r--sys/arch/i386/conf/files.i38615
1 files changed, 9 insertions, 6 deletions
diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386
index dc3876f26aa..1494ab9d03a 100644
--- a/sys/arch/i386/conf/files.i386
+++ b/sys/arch/i386/conf/files.i386
@@ -1,4 +1,4 @@
-# $OpenBSD: files.i386,v 1.41 1998/04/26 21:41:48 provos Exp $
+# $OpenBSD: files.i386,v 1.42 1998/06/02 18:46:34 deraadt Exp $
# $NetBSD: files.i386,v 1.73 1996/05/07 00:58:36 thorpej Exp $
#
# new style config file for i386 architecture
@@ -176,11 +176,6 @@ attach ed at pcmcia with ed_pcmcia
attach ed at pci with ed_pci
file dev/isa/if_ed.c ed & (ed_isa | ed_pcmcia | ed_pci) needs-flag
-# Game adapter (joystick)
-device joy
-attach joy at isa
-file arch/i386/isa/joy.c joy needs-flag
-
# Adaptec AHA-284x VL SCSI controllers
# device declaration in sys/conf/files
attach ahc at isa with ahc_isa
@@ -206,6 +201,14 @@ file arch/i386/isa/isapnp_machdep.c isapnp
attach pccom at isapnp with pccom_isapnp
+# Game adapter (joystick)
+device joy
+file arch/i386/isa/joy.c joy needs-flag
+attach joy at isa with joy_isa
+file arch/i386/isa/joy_isa.c joy_isa
+attach joy at isapnp with joy_isapnp
+file arch/i386/isa/joy_isapnp.c joy_isapnp
+
#
# Compatibility modules
#