summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorAlexandre Ratchov <ratchov@cvs.openbsd.org>2010-10-08 18:21:35 +0000
committerAlexandre Ratchov <ratchov@cvs.openbsd.org>2010-10-08 18:21:35 +0000
commitb05c9ce218a13d9cc7c40b37eb17149fb0793bfc (patch)
tree7fcd266dfc81aa956f0e218ef2ce34acdcbd90cc /sys
parent915fccacd69e51b57371aafc8e343a028164f2d0 (diff)
allocate a major number to midi, since midi is already enabled
ok deraadt, miod
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/sparc64/sparc64/conf.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/arch/sparc64/sparc64/conf.c b/sys/arch/sparc64/sparc64/conf.c
index 3a10000c31e..df679dfa618 100644
--- a/sys/arch/sparc64/sparc64/conf.c
+++ b/sys/arch/sparc64/sparc64/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.57 2010/09/23 05:02:14 claudio Exp $ */
+/* $OpenBSD: conf.c,v 1.58 2010/10/08 18:21:34 ratchov Exp $ */
/* $NetBSD: conf.c,v 1.17 2001/03/26 12:33:26 lukem Exp $ */
/*
@@ -55,6 +55,7 @@
#include "pty.h"
#include "bpfilter.h"
#include "tun.h"
+#include "midi.h"
#include "audio.h"
#include "video.h"
#include "vnd.h"
@@ -231,7 +232,7 @@ struct cdevsw cdevsw[] =
cdev_notdef(), /* 65 */
cdev_notdef(), /* 66 */
cdev_notdef(), /* 67 */
- cdev_notdef(), /* 68 */
+ cdev_midi_init(NMIDI,midi), /* 68: /dev/rmidi */
cdev_audio_init(NAUDIO,audio), /* 69: /dev/audio */
cdev_openprom_init(1,openprom), /* 70: /dev/openprom */
cdev_tty_init(NMTTY,mtty), /* 71: magma serial ports */