From 87fe7cbab8dbd5f33c56789c56335037323956df Mon Sep 17 00:00:00 2001
From: Marc Espie <espie@cvs.openbsd.org>
Date: Thu, 12 Oct 2000 19:36:53 +0000
Subject: Repair RAMDISK, which has no joystick. Thanks jj for testing, and
 miod for explanations.

---
 sys/arch/amiga/amiga/conf.c     | 5 +++--
 sys/arch/amiga/conf/files.amiga | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'sys/arch')

diff --git a/sys/arch/amiga/amiga/conf.c b/sys/arch/amiga/amiga/conf.c
index 60c187c23ec..bd0dcabfd68 100644
--- a/sys/arch/amiga/amiga/conf.c
+++ b/sys/arch/amiga/amiga/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.28 2000/09/26 14:03:51 art Exp $	*/
+/*	$OpenBSD: conf.c,v 1.29 2000/10/12 19:36:51 espie Exp $	*/
 /*	$NetBSD: conf.c,v 1.42 1997/01/07 11:35:03 mrg Exp $	*/
 
 /*-
@@ -95,6 +95,7 @@ int	nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]);
 #include "ser.h"
 #include "msc.h"
 #include "ite.h"
+#include "joy.h"
 #include "kbd.h"
 #include "ms.h"
 #include "view.h"
@@ -161,7 +162,7 @@ struct cdevsw	cdevsw[] =
 	cdev_ch_init(NCH,ch),		/* 40: SCSI autochanger */
 	cdev_disk_init(NRD,rd),		/* 41: RAM disk */
 	cdev_ksyms_init(NKSYMS,ksyms),	/* 42: Kernel symbols device */
-	cdev_joy_init(1,joy),		/* 43: Joystick */
+	cdev_joy_init(NJOY,joy),	/* 43: Joystick */
 	cdev_notdef(),			/* 44 */
 	cdev_notdef(),			/* 45 */
 	cdev_notdef(),			/* 46 */
diff --git a/sys/arch/amiga/conf/files.amiga b/sys/arch/amiga/conf/files.amiga
index 4cef7ce777d..7984722bca0 100644
--- a/sys/arch/amiga/conf/files.amiga
+++ b/sys/arch/amiga/conf/files.amiga
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.amiga,v 1.38 2000/09/02 13:45:39 espie Exp $
+#	$OpenBSD: files.amiga,v 1.39 2000/10/12 19:36:52 espie Exp $
 #	$NetBSD: files.amiga,v 1.62 1997/08/27 19:32:47 is Exp $
 
 
@@ -29,7 +29,7 @@ file	dev/clock_subr.c
 # joystick
 device	joy
 attach	joy at mainbus
-file	arch/amiga/dev/joy.c		joy
+file	arch/amiga/dev/joy.c		joy needs-flag
 
 # A2000 internal hwc
 device	a2kbbc
-- 
cgit v1.2.3