xserver: Branch 'master'

[Alex Deucher]

 hw/xfree86/modes/xf86Crtc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2a61397d17339113b9e37995b06ca543589814ce
Author: Cooper Yuan <Cooper.Yuan at amd.com>
Date:   Mon Dec 15 10:29:34 2008 -0500

    Fix typo in xf86PickCrtcs()

diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index 6b37a72..d580ada 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -988,7 +988,7 @@ xf86PickCrtcs (ScrnInfoPtr	scrn,
 	     * see if they can be cloned
 	     */
 	    if (xf86ModesEqual (modes[o], modes[n]) &&
-		config->output[0]->initial_rotation == config->output[n]->initial_rotation &&
+		config->output[o]->initial_rotation == config->output[n]->initial_rotation &&
 		config->output[o]->initial_x == config->output[n]->initial_x &&
 		config->output[o]->initial_y == config->output[n]->initial_y)
 	    {