diff options
| author | emaste <emaste@FreeBSD.org> | 2014-07-24 15:18:19 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2014-07-24 15:18:19 +0000 |
| commit | c739145ff0dbb31f2524799e8e0ca862acc13ab6 (patch) | |
| tree | 98e44d9ef29c77dcc86af71d57e5f66532109190 /sys | |
| parent | 2fab8ef49d349bd7963072555a6619d3cece3d07 (diff) | |
| download | FreeBSD-src-c739145ff0dbb31f2524799e8e0ca862acc13ab6.zip FreeBSD-src-c739145ff0dbb31f2524799e8e0ca862acc13ab6.tar.gz | |
MFC r268947: Hide syscons-specific workaround under DEV_SC
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/drm2/i915/intel_fb.c | 5 | ||||
| -rw-r--r-- | sys/dev/vt/vt_core.c | 3 |
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"); |
