xserver: Branch 'master'

[Maarten Maathuis]

 hw/xfree86/dixmods/extmod/xf86misc.c |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit c38feeb1492d9a47379b2e4d77dbadd8c421d17f
Author: Maarten Maathuis <madman2003 at gmail.com>
Date:   Thu Feb 14 18:52:47 2008 +0100

    Fix typo in commit b8b7cdf6df3d338c50db670ce4cfd245f9fa8844.

diff --git a/hw/xfree86/dixmods/extmod/xf86misc.c b/hw/xfree86/dixmods/extmod/xf86misc.c
index 3164d75..d2ee595 100644
--- a/hw/xfree86/dixmods/extmod/xf86misc.c
+++ b/hw/xfree86/dixmods/extmod/xf86misc.c
@@ -111,7 +111,6 @@ static unsigned char XF86MiscReqCode = 0;
 # define DEBUG_P(x) ErrorF(x"\n");
 #else
 # define DEBUG_P(x) do {} while (0)
-}
 #endif
 
 #define MISCERR(x)	(miscErrorBase + x)