xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_output.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a4899db96029acde6cd400fc0541693a487898e7
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Sat Feb 5 14:11:42 2011 -0500

    UMS: fix spelling in error message
    
    Noticed by: Warren Block <wblock at wonkity.com>
    
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>

diff --git a/src/radeon_output.c b/src/radeon_output.c
index f643870..15cef06 100644
--- a/src/radeon_output.c
+++ b/src/radeon_output.c
@@ -1640,7 +1640,7 @@ radeon_set_mode_for_property(xf86OutputPtr output)
 				 crtc->desiredX, crtc->desiredY)) {
 #endif
 		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-			   "Failed to set mode after propery change!\n");
+			   "Failed to set mode after property change!\n");
 		return FALSE;
 	    }
 	}