xserver: Branch 'master'

[Keith Packard]

 randr/rrinfo.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree b2dcfbca2441ca8c561f86a78a76ab59ecbb40e4 (from ab3f601149e15789edfb7c9a0c33387070279582)
Author: Keith Packard <keithp at koto.keithp.com>
Date:   Wed Aug 8 12:16:12 2007 -0700

    RRScanOldConfig cannot use RRFirstOutput before output is configured.
    
    RRFirstOutput returns the first active output, which won't be set until
    after RRScanOldConfig is finished running. Instead, just use the first
    output (which is the only output present with an old driver, after all).

diff --git a/randr/rrinfo.c b/randr/rrinfo.c
index 8b0c93d..7e77d39 100644
--- a/randr/rrinfo.c
+++ b/randr/rrinfo.c
@@ -104,7 +104,7 @@ RRScanOldConfig (ScreenPtr pScreen, Rota
 #endif
     }
 
-    output = RRFirstOutput (pScreen);
+    output = pScrPriv->outputs[0];
     if (!output)
 	return;
     crtc = pScrPriv->crtcs[0];