Imported Debian patch 2:1.15.1-0ubuntu2.6

[deb_xorg-server.git] / debian / patches / 188_default_primary_to_first_busid.patch

diff --git a/debian/patches/188_default_primary_to_first_busid.patch b/debian/patches/188_default_primary_to_first_busid.patch
new file mode 100644 (file)
index 0000000..99c33c0
--- /dev/null
+++ b/debian/patches/188_default_primary_to_first_busid.patch
@@ -0,0 +1,15 @@
+diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
+index e52f1da..462faa9 100644
+--- a/hw/xfree86/common/xf86pciBus.c
++++ b/hw/xfree86/common/xf86pciBus.c
+@@ -135,8 +135,8 @@ xf86PciProbe(void)
+                 }
+                 else {
+                     xf86Msg(X_NOTICE,
+-                            "More than one possible primary device found\n");
+-                    primaryBus.type ^= (BusType) (-1);
++                            "More than one possible primary device found.  Using first one seen.\n");
++                    break;
+                 }
+             }
+         }