summaryrefslogtreecommitdiffstats
path: root/sys/dev
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/drm2/i915/intel_fb.c5
-rw-r--r--sys/dev/vt/vt_core.c3
2 files changed, 5 insertions, 3 deletions
diff --git a/sys/dev/drm2/i915/intel_fb.c b/sys/dev/drm2/i915/intel_fb.c
index 2957920..f8a68ec 100644
--- a/sys/dev/drm2/i915/intel_fb.c
+++ b/sys/dev/drm2/i915/intel_fb.c
@@ -27,6 +27,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+#include "opt_syscons.h"
#include <dev/drm2/drmP.h>
#include <dev/drm2/drm.h>
#include <dev/drm2/drm_crtc.h>
@@ -216,7 +217,9 @@ static void intel_fbdev_destroy(struct drm_device *dev,
}
}
+#ifdef DEV_SC
extern int sc_txtmouse_no_retrace_wait;
+#endif
int intel_fbdev_init(struct drm_device *dev)
{
@@ -240,7 +243,9 @@ int intel_fbdev_init(struct drm_device *dev)
drm_fb_helper_single_add_all_connectors(&ifbdev->helper);
drm_fb_helper_initial_config(&ifbdev->helper, 32);
+#ifdef DEV_SC
sc_txtmouse_no_retrace_wait = 1;
+#endif
return 0;
}
diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c
index 915526c..72ccce8 100644
--- a/sys/dev/vt/vt_core.c
+++ b/sys/dev/vt/vt_core.c
@@ -111,9 +111,6 @@ const struct terminal_class vt_termclass = {
#define VT_UNIT(vw) ((vw)->vw_device->vd_unit * VT_MAXWINDOWS + \
(vw)->vw_number)
-/* XXX while syscons is here. */
-int sc_txtmouse_no_retrace_wait;
-
static SYSCTL_NODE(_kern, OID_AUTO, vt, CTLFLAG_RD, 0, "vt(9) parameters");
VT_SYSCTL_INT(enable_altgr, 1, "Enable AltGr key (Do not assume R.Alt as Alt)");
VT_SYSCTL_INT(debug, 0, "vt(9) debug level");
OpenPOWER on IntegriCloud