xserver: Branch 'master'

[Keith Packard]

 hw/xfree86/os-support/shared/posix_tty.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4dbed2625431a92e20bede7b8cef847b5d5d99ba
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Mon Jun 27 14:45:18 2011 +1000

    xfree86: Only log the serial bytes if debug is on.
    
    Introduced in e3f296d91dfe6b827195e1d387e1a04aa73b85c3, when the ifdef DEBUG
    around the whole block was removed, but only two of the three ErrorF
    switched to DebugF.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xfree86/os-support/shared/posix_tty.c b/hw/xfree86/os-support/shared/posix_tty.c
index 1a33070..fb83860 100644
--- a/hw/xfree86/os-support/shared/posix_tty.c
+++ b/hw/xfree86/os-support/shared/posix_tty.c
@@ -404,7 +404,7 @@ xf86WriteSerial (int fd, const void *buf, int count)
 
 	DebugF("WritingSerial: 0x%x",(unsigned char)*(((unsigned char *)buf)));
 	for (i = 1; i < count; i++)
-	    ErrorF(", 0x%x",(unsigned char)*(((unsigned char *)buf) + i));
+	    DebugF(", 0x%x",(unsigned char)*(((unsigned char *)buf) + i));
 	DebugF("\n");
 	SYSCALL (r = write (fd, buf, count));
 	return r;