X-Git-Url: https://git.piment-noir.org/?p=deb_xorg-server.git;a=blobdiff_plain;f=debian%2Fpatches%2F111_armel-drv-fallbacks.patch;h=ccbbdc46465f07ad7f4411e11f197c37971643ab;hp=bc76c4eec6bcb3a113c163df4c477445f209c249;hb=4db25562fe97995f20b8adc0f2e6959ed82e8635;hpb=7217e0ca50bba73dad94782e67980aeeb24ab693

diff --git a/debian/patches/111_armel-drv-fallbacks.patch b/debian/patches/111_armel-drv-fallbacks.patch
index bc76c4e..ccbbdc4 100644
--- a/debian/patches/111_armel-drv-fallbacks.patch
+++ b/debian/patches/111_armel-drv-fallbacks.patch
@@ -1,5 +1,3 @@
-diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
-index 55412b4..d4a95d2 100644
 --- a/hw/xfree86/common/xf86AutoConfig.c
 +++ b/hw/xfree86/common/xf86AutoConfig.c
 @@ -45,6 +45,12 @@
@@ -43,9 +41,9 @@ index 55412b4..d4a95d2 100644
  static void
  listPossibleVideoDrivers(char *matches[], int nmatches)
  {
-@@ -287,6 +314,21 @@ listPossibleVideoDrivers(char *matches[], int nmatches)
+@@ -279,6 +306,21 @@ listPossibleVideoDrivers(char *matches[]
+         i = xf86PciMatchDriver(matches, nmatches);
  #endif
-     }
  
 +#if defined(__linux__) && defined(__arm__)
 +    if (i < (nmatches - 1)) {
@@ -65,11 +63,9 @@ index 55412b4..d4a95d2 100644
  #if defined(__linux__)
      matches[i++] = xnfstrdup("modesetting");
  #endif
-diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
-index 24b9473..0061c25 100644
 --- a/hw/xfree86/common/xf86platformBus.c
 +++ b/hw/xfree86/common/xf86platformBus.c
-@@ -362,6 +362,14 @@ xf86platformProbeDev(DriverPtr drvp)
+@@ -372,6 +372,14 @@ xf86platformProbeDev(DriverPtr drvp)
                      if (xf86IsPrimaryPlatform(&xf86_platform_devices[j]))
                          break;
                  }