X-Git-Url: https://git.piment-noir.org/?p=deb_xorg-server.git;a=blobdiff_plain;f=debian%2Fpatches%2F226_fall_back_to_autoconfiguration.patch;h=19514001df3da82c1274d54732836bf3d19305be;hp=70fa7e532c8be34e347a05c35451b69d8444bc9d;hb=4db25562fe97995f20b8adc0f2e6959ed82e8635;hpb=7217e0ca50bba73dad94782e67980aeeb24ab693

diff --git a/debian/patches/226_fall_back_to_autoconfiguration.patch b/debian/patches/226_fall_back_to_autoconfiguration.patch
index 70fa7e5..1951400 100644
--- a/debian/patches/226_fall_back_to_autoconfiguration.patch
+++ b/debian/patches/226_fall_back_to_autoconfiguration.patch
@@ -1,6 +1,6 @@
 --- 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;
@@ -10,7 +10,7 @@
      "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);
          }
  
@@ -48,9 +48,9 @@
          }
  
          /* 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;
@@ -68,7 +68,7 @@
  
 --- 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;