summaryrefslogtreecommitdiff
path: root/sys/dev/wscons/wsemulconf.c
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2006-12-09 20:06:49 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2006-12-09 20:06:49 +0000
commit071015e8f42be22ae819f7c067512dd7f3d8dda0 (patch)
tree2bafd1324b1ce67b0f0c8d49f621bcee78891423 /sys/dev/wscons/wsemulconf.c
parentf1891b5513a2142c5c5fb66331682154805ae5c1 (diff)
Do not make sun terminal emulation selected by the wsemul_sun frame buffer
attribute anymore; remove it and use option WSEMUL_SUN instead, which gets added to all sparc* kernels. While there, do not compile vt100 emulation on sparc* kernels, this saves 16+ KB of text. ok deraadt@
Diffstat (limited to 'sys/dev/wscons/wsemulconf.c')
-rw-r--r--sys/dev/wscons/wsemulconf.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/dev/wscons/wsemulconf.c b/sys/dev/wscons/wsemulconf.c
index bac9ab91920..eeabbf5175f 100644
--- a/sys/dev/wscons/wsemulconf.c
+++ b/sys/dev/wscons/wsemulconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsemulconf.c,v 1.5 2002/01/03 21:58:59 jason Exp $ */
+/* $OpenBSD: wsemulconf.c,v 1.6 2006/12/09 20:06:48 miod Exp $ */
/* $NetBSD: wsemulconf.c,v 1.4 2000/01/05 11:19:37 drochner Exp $ */
/*
@@ -33,19 +33,17 @@
#include "wsdisplay.h"
-#include <sys/cdefs.h>
-
#include <sys/param.h>
#include <sys/systm.h>
#include <dev/wscons/wsconsio.h>
#include <dev/wscons/wsdisplayvar.h>
#include <dev/wscons/wsksymvar.h>
-#include <dev/wscons/wsemulvar.h> /* pulls in opt_wsemul.h */
+#include <dev/wscons/wsemulvar.h>
#include <dev/wscons/wscons_callbacks.h>
static const struct wsemul_ops *wsemul_conf[] = {
-#if defined(WSEMUL_SUN) || (NWSEMUL_SUN > 0)
+#ifdef WSEMUL_SUN
&wsemul_sun_ops,
#endif
#ifndef WSEMUL_NO_VT100