--- a/hw/xfree86/common/xf86Globals.c
+++ b/hw/xfree86/common/xf86Globals.c
-@@ -161,6 +161,7 @@
+@@ -162,6 +162,7 @@ InputDriverPtr *xf86InputDriverList = NU
int xf86NumInputDrivers = 0;
int xf86NumScreens = 0;
int xf86NumGPUScreens = 0;
"StaticGray",
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
-@@ -481,20 +481,34 @@
+@@ -482,20 +482,34 @@ InitOutput(ScreenInfo * pScreenInfo, int
free(optionlist);
}
}
/* Load all input driver modules specified in the config file. */
-@@ -554,8 +568,15 @@
- else
- xf86Info.dontVTSwitch = TRUE;
+@@ -557,8 +571,15 @@ InitOutput(ScreenInfo * pScreenInfo, int
+ if (want_hw_access)
+ xorgHWAccess = xf86EnableIO();
- if (xf86BusConfig() == FALSE)
- return;
--- a/hw/xfree86/common/xf86Priv.h
+++ b/hw/xfree86/common/xf86Priv.h
-@@ -89,6 +89,7 @@
+@@ -89,6 +89,7 @@ extern _X_EXPORT int xf86NumDrivers;
extern _X_EXPORT Bool xf86Resetting;
extern _X_EXPORT Bool xf86Initialising;
extern _X_EXPORT int xf86NumScreens;