X-Git-Url: https://git.piment-noir.org/?p=deb_xorg-server.git;a=blobdiff_plain;f=debian%2Fpatches%2F105_nvidia_fglrx_autodetect.patch;h=5462eb1a5704b795fe968e6aa20da204f07432b0;hp=1d082053941c8d03e8a8a1c6da95547e5e9d53d6;hb=4db25562fe97995f20b8adc0f2e6959ed82e8635;hpb=7217e0ca50bba73dad94782e67980aeeb24ab693

diff --git a/debian/patches/105_nvidia_fglrx_autodetect.patch b/debian/patches/105_nvidia_fglrx_autodetect.patch
index 1d08205..5462eb1 100644
--- a/debian/patches/105_nvidia_fglrx_autodetect.patch
+++ b/debian/patches/105_nvidia_fglrx_autodetect.patch
@@ -1,8 +1,6 @@
-diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
-index 43c746b..750b425 100644
 --- a/hw/xfree86/common/xf86AutoConfig.c
 +++ b/hw/xfree86/common/xf86AutoConfig.c
-@@ -75,6 +75,13 @@
+@@ -76,6 +76,13 @@
  	"\tDevice\t" BUILTIN_DEVICE_NAME "\n" \
  	"EndSection\n\n"
  
@@ -16,7 +14,7 @@ index 43c746b..750b425 100644
  #define BUILTIN_LAYOUT_SECTION_PRE \
  	"Section \"ServerLayout\"\n" \
  	"\tIdentifier\t\"Builtin Default Layout\"\n"
-@@ -153,7 +160,11 @@ xf86AutoConfig(void)
+@@ -154,7 +161,11 @@ xf86AutoConfig(void)
      for (p = deviceList; *p; p++) {
          snprintf(buf, sizeof(buf), BUILTIN_DEVICE_SECTION, *p, 0, *p);
          AppendToConfig(buf);
@@ -29,11 +27,9 @@ index 43c746b..750b425 100644
          AppendToConfig(buf);
      }
  
-diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
-index e52f1da..bd62a7e 100644
 --- a/hw/xfree86/common/xf86pciBus.c
 +++ b/hw/xfree86/common/xf86pciBus.c
-@@ -1107,7 +1107,8 @@ videoPtrToDriverList(struct pci_device *dev,
+@@ -1132,7 +1132,8 @@ xf86VideoPtrToDriverList(struct pci_devi
          driverList[0] = "ast";
          break;
      case 0x1002:
@@ -43,7 +39,7 @@ index e52f1da..bd62a7e 100644
          break;
      case 0x102c:
          driverList[0] = "chips";
-@@ -1143,6 +1144,7 @@ videoPtrToDriverList(struct pci_device *dev,
+@@ -1216,6 +1217,7 @@ xf86VideoPtrToDriverList(struct pci_devi
      {
          int idx = 0;