xserver: Branch 'master'

[Greg Kroah-Hartman]

 Xprint/Init.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree a940b851faba569e36983f7885aefa72f7bf2ade (from 9e0c82386ae389bcc296a5ad44e996790b033ad3)
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Thu Jun 8 10:17:53 2006 -0700

    fix function pointer warning in Xprint/Init.c

diff --git a/Xprint/Init.c b/Xprint/Init.c
index efee000..70754e9 100644
--- a/Xprint/Init.c
+++ b/Xprint/Init.c
@@ -1601,7 +1601,7 @@ InitPrintDrivers(
 	    }
 	    if(callInit == TRUE)
 	    {
-	        Bool (*initFunc)();
+	        Bool (*initFunc)(BFuncArgs);
 	        initFunc = GetInitFunc(pDb->driverName);
 	        if(initFunc(index, pScreen, argc, argv) == FALSE)
 	        {