diff options
| -rw-r--r-- | sys/arch/macppc/conf/GENERIC | 3 | ||||
| -rw-r--r-- | sys/arch/macppc/conf/RAMDISK | 3 | ||||
| -rw-r--r-- | sys/dev/wscons/files.wscons | 4 | ||||
| -rw-r--r-- | sys/dev/wscons/wsemulconf.c | 4 | ||||
| -rw-r--r-- | sys/dev/wscons/wsemulvar.h | 4 |
5 files changed, 8 insertions, 10 deletions
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC index b1efa944efa..72750d2e89a 100644 --- a/sys/arch/macppc/conf/GENERIC +++ b/sys/arch/macppc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.6 2001/11/13 14:31:52 drahn Exp $ +# $OpenBSD: GENERIC,v 1.7 2001/12/01 18:41:48 deraadt Exp $ # # PPC GENERIC config file # @@ -16,7 +16,6 @@ option PPC_MPC106_BUG option PCIVERBOSE option USBVERBOSE #option MACOBIOVERBOSE -option WSEMUL_NO_DUMB #option PPC_VECTOR_SUPPORTED option USER_PCICONF # user-space PCI configuration diff --git a/sys/arch/macppc/conf/RAMDISK b/sys/arch/macppc/conf/RAMDISK index 9b739fad8d6..0ae9921d919 100644 --- a/sys/arch/macppc/conf/RAMDISK +++ b/sys/arch/macppc/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.3 2001/10/10 23:43:42 millert Exp $ +# $OpenBSD: RAMDISK,v 1.4 2001/12/01 18:41:48 deraadt Exp $ # # PPC GENERIC config file # @@ -14,7 +14,6 @@ option SYS_TYPE=APPL option FIREPOWERBUGS option PPC_MPC106_BUG option PCIVERBOSE -option WSEMUL_NO_DUMB # include "../../../conf/GENERIC" option TIMEZONE=0 # time zone to adjust RTC time by diff --git a/sys/dev/wscons/files.wscons b/sys/dev/wscons/files.wscons index ad594f30be3..8fe65772292 100644 --- a/sys/dev/wscons/files.wscons +++ b/sys/dev/wscons/files.wscons @@ -1,4 +1,4 @@ -# $OpenBSD: files.wscons,v 1.4 2001/02/13 14:50:33 deraadt Exp $ +# $OpenBSD: files.wscons,v 1.5 2001/12/01 18:41:33 deraadt Exp $ # $NetBSD: files.wscons,v 1.19 1999/12/12 08:17:28 scottr Exp $ # @@ -25,7 +25,7 @@ attach wsmouse at wsmousedev file dev/wscons/wsdisplay.c wsdisplay needs-flag file dev/wscons/wsdisplay_compat_usl.c wsdisplay & wsdisplay_compat_usl file dev/wscons/wsemulconf.c wsdisplay -file dev/wscons/wsemul_dumb.c wsdisplay & !wsemul_no_dumb +file dev/wscons/wsemul_dumb.c wsdisplay & wsemul_dumb file dev/wscons/wsemul_sun.c wsdisplay & wsemul_sun file dev/wscons/wsemul_vt100.c wsdisplay & !wsemul_no_vt100 file dev/wscons/wsemul_vt100_subr.c wsdisplay & !wsemul_no_vt100 diff --git a/sys/dev/wscons/wsemulconf.c b/sys/dev/wscons/wsemulconf.c index af99b61a66d..b62df80a615 100644 --- a/sys/dev/wscons/wsemulconf.c +++ b/sys/dev/wscons/wsemulconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsemulconf.c,v 1.3 2001/03/14 02:49:23 mickey Exp $ */ +/* $OpenBSD: wsemulconf.c,v 1.4 2001/12/01 18:41:33 deraadt Exp $ */ /* $NetBSD: wsemulconf.c,v 1.4 2000/01/05 11:19:37 drochner Exp $ */ /* @@ -49,7 +49,7 @@ static const struct wsemul_ops *wsemul_conf[] = { #ifndef WSEMUL_NO_VT100 &wsemul_vt100_ops, #endif -#ifndef WSEMUL_NO_DUMB +#ifdef WSEMUL_DUMB &wsemul_dumb_ops, #endif NULL diff --git a/sys/dev/wscons/wsemulvar.h b/sys/dev/wscons/wsemulvar.h index 3a5cf858ac3..a5e7d084ee0 100644 --- a/sys/dev/wscons/wsemulvar.h +++ b/sys/dev/wscons/wsemulvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: wsemulvar.h,v 1.3 2001/03/14 02:49:23 mickey Exp $ */ +/* $OpenBSD: wsemulvar.h,v 1.4 2001/12/01 18:41:33 deraadt Exp $ */ /* $NetBSD: wsemulvar.h,v 1.6 1999/01/17 15:46:15 drochner Exp $ */ /* @@ -54,7 +54,7 @@ struct wsemul_ops { void (*reset) __P((void *, enum wsemul_resetops)); }; -#ifndef WSEMUL_NO_DUMB +#ifdef WSEMUL_DUMB extern const struct wsemul_ops wsemul_dumb_ops; #endif #ifdef WSEMUL_SUN |