xserver: Branch 'master'

[Greg Kroah-Hartman]

 Xprint/ddxInit.c |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)

New commits:
diff-tree 9583859d538394e98ac1f38b8e6f0997e321621d (from cb9e29c184474edd75645e3b52e22a097a242e40)
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Fri Jun 9 09:59:22 2006 -0700

    remove unneeded "extern" in Xprint/ddxInit.c

diff --git a/Xprint/ddxInit.c b/Xprint/ddxInit.c
index 29e7c98..d4c0b9a 100644
--- a/Xprint/ddxInit.c
+++ b/Xprint/ddxInit.c
@@ -295,8 +295,7 @@ ddxProcessArgument (
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
 #include "XIstubs.h"
-
-extern  int     BadDevice;
+#include "exglobals.h"
 
 int
 ChangePointerDevice (