← Back to branch summary

~ubuntu-branches/ubuntu/precise/xorg-server-lts-trusty/precise-proposed

« back to all changes in this revision

Viewing changes to debian/patches/188_default_primary_to_first_busid.patch

  • Committer: Package Import Robot
  • Author(s): Maarten Lankhorst
  • Date: 2014-05-29 11:23:45 UTC
  • Revision ID: package-import@ubuntu.com-20140529112345-nds4yarvo25d2r32
Tags: 2:1.15.1-0ubuntu2~precise1
https://launchpad.net/bugs/1318616
Initial lts-trusty upload, i386/amd64 only. (LP: #1318616)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/188_default_primary_to_first_busid.patch
 
1
diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
 
2
index e52f1da..462faa9 100644
 
3
--- a/hw/xfree86/common/xf86pciBus.c
 
4
+++ b/hw/xfree86/common/xf86pciBus.c
 
5
@@ -135,8 +135,8 @@ xf86PciProbe(void)
 
6
                 }
 
7
                 else {
 
8
                     xf86Msg(X_NOTICE,
 
9
-                            "More than one possible primary device found\n");
 
10
-                    primaryBus.type ^= (BusType) (-1);
 
11
+                            "More than one possible primary device found.  Using first one seen.\n");
 
12
+                    break;
 
13
                 }
 
14
             }
 
15
         }