xserver: Branch 'master'

[Alan Coopersmith]

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

New commits:
commit 925e895b869e461a9e7f135891463c56ee633cd6
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Mon May 19 18:43:29 2008 -0700

    Restore return type on xf86SetScrnInfoModes
    
    Seems to have been accidentally lost by commit 	76943fec860315f3c93539e59a59080b8a7b3e75

diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index 41ac2f6..7edd23c 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -1692,6 +1692,7 @@ SetCompatOutput(xf86CrtcConfigPtr config)
     return output;
 }
 
+_X_EXPORT void
 xf86SetScrnInfoModes (ScrnInfoPtr scrn)
 {
     xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);