diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2007-06-20 18:28:57 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2007-06-20 18:28:57 +0000 |
| commit | 3e3025bdb140e16ae0c111fd50cf5892ab6e059e (patch) | |
| tree | c972b5123107d6ceebec9be1f087ee19a86c3c12 | |
| parent | a43d98ed209ffbf75de0ad01d2c7c3ffcf8941d5 (diff) | |
alpha kernel have wsmux but not the actual devices; PR #5469 from janjaap
| -rw-r--r-- | etc/etc.alpha/MAKEDEV.md | 4 | ||||
| -rw-r--r-- | sys/arch/alpha/alpha/conf.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/etc/etc.alpha/MAKEDEV.md b/etc/etc.alpha/MAKEDEV.md index d3ca2205b81..75b75163b09 100644 --- a/etc/etc.alpha/MAKEDEV.md +++ b/etc/etc.alpha/MAKEDEV.md @@ -1,5 +1,5 @@ vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.33 2007/05/28 22:26:01 todd Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.34 2007/06/20 18:28:55 miod Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -46,7 +46,7 @@ _TITLE(cons) _DEV(wscons) _DEV(wsdisp, 25) _DEV(wskbd, 29) -_DEV(wsmux, 56) +_DEV(wsmux, 60) _TITLE(point) _DEV(wsmouse, 30) _TITLE(prn) diff --git a/sys/arch/alpha/alpha/conf.c b/sys/arch/alpha/alpha/conf.c index 23c5e155c07..747d3eea299 100644 --- a/sys/arch/alpha/alpha/conf.c +++ b/sys/arch/alpha/alpha/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.54 2007/05/28 22:26:03 todd Exp $ */ +/* $OpenBSD: conf.c,v 1.55 2007/06/20 18:28:56 miod Exp $ */ /* $NetBSD: conf.c,v 1.16 1996/10/18 21:26:57 cgd Exp $ */ /*- @@ -96,6 +96,7 @@ cdev_decl(com); #include "wsdisplay.h" #include "wskbd.h" #include "wsmouse.h" +#include "wsmux.h" #include "midi.h" cdev_decl(midi); #include "sequencer.h" @@ -203,6 +204,7 @@ struct cdevsw cdevsw[] = cdev_crypto_init(NCRYPTO,crypto), /* 57: /dev/crypto */ cdev_bktr_init(NBKTR,bktr), /* 58: Bt848 video capture device */ cdev_radio_init(NRADIO,radio), /* 59: generic radio I/O */ + cdev_mouse_init(NWSMUX, wsmux), /* 60: ws multiplexor */ }; int nchrdev = sizeof (cdevsw) / sizeof (cdevsw[0]); |