xserver: Branch 'master'

[Dave Airlie]

 hw/xfree86/loader/loadmod.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 1072b88a8f352484e70bc749e300c936e5600480 (from 804080a7096347d48c686f2c8fbfd06326bce400)
Author: Dave Airlie <airlied at linux.ie>
Date:   Sun Mar 25 10:06:00 2007 +1000

    loader: fix already built-in message

diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c
index c220d8a..a83b889 100644
--- a/hw/xfree86/loader/loadmod.c
+++ b/hw/xfree86/loader/loadmod.c
@@ -869,7 +869,7 @@ doLoadModule(const char *module, const c
     for (cim = compiled_in_modules; *cim; cim++)
 	if (!strcmp (module, *cim))
 	{
-	    xf86MsgVerb(X_INFO, 3, "Module alread ybuilt-in");
+	    xf86MsgVerb(X_INFO, 3, "Module already built-in\n");
 	    return (ModuleDescPtr) 1;
 	}