xserver: Branch 'master'

[Alan Coopersmith]

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

New commits:
diff-tree e523859a952d49b20f3d10152cc0ef695d2c12a1 (from 5138f710a1574fef6f553f3fe2fccac0620d2584)
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Wed Jun 20 17:54:38 2007 -0700

    Include module name in "already built-in" message

diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c
index 6a1c65e..ea559aa 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, 0, "Module already built-in\n");
+	    xf86MsgVerb(X_INFO, 0, "Module \"%s\" already built-in\n", module);
 	    return (ModuleDescPtr) 1;
 	}