diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h index f890d7099..141440746 100644 --- a/hw/xfree86/common/xf86.h +++ b/hw/xfree86/common/xf86.h @@ -249,8 +249,6 @@ xf86ServerIsExiting(void); extern _X_EXPORT Bool xf86ServerIsOnlyDetecting(void); extern _X_EXPORT Bool -xf86GetVidModeEnabled(void); -extern _X_EXPORT Bool xf86GetAllowMouseOpenFail(void); extern _X_EXPORT CARD32 xorgGetVersion(void); diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c index 97dfcbc44..8393491c4 100644 --- a/hw/xfree86/common/xf86Helper.c +++ b/hw/xfree86/common/xf86Helper.c @@ -1383,12 +1383,6 @@ xf86ServerIsOnlyDetecting(void) return xf86DoConfigure; } -Bool -xf86GetVidModeEnabled(void) -{ - return xf86Info.vidModeEnabled; -} - Bool xf86GetAllowMouseOpenFail(void) { diff --git a/hw/xfree86/common/xf86VidMode.c b/hw/xfree86/common/xf86VidMode.c index 21e0c4ab0..a248bd841 100644 --- a/hw/xfree86/common/xf86VidMode.c +++ b/hw/xfree86/common/xf86VidMode.c @@ -400,7 +400,7 @@ xf86VidModeInit(ScreenPtr pScreen) { VidModePtr pVidMode; - if (!xf86GetVidModeEnabled()) { + if (!xf86Info.vidModeEnabled) { DebugF("!xf86GetVidModeEnabled()\n"); return FALSE; } @@ -448,7 +448,7 @@ XFree86VidModeExtensionInit(void) DebugF("XFree86VidModeExtensionInit"); /* This means that the DDX doesn't want the vidmode extension enabled */ - if (!xf86GetVidModeEnabled()) + if (!xf86Info.vidModeEnabled) return; for (i = 0; i < screenInfo.numScreens; i++) {