xserver: Branch 'server-1.2-branch'

[Michel Daenzer]

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

New commits:
diff-tree d12d0839fdede9ddad219815ced89664a2c44458 (from 6e73c87c53f39a2386dc4c1ac4fc354d961e0c45)
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Wed Oct 25 11:39:27 2006 +0200

    Fix test for Option "IgnoreABI".
    
    This option has plenty of potential for wasting the time of bug triagers
    without pretending it's always on.
    (cherry picked from becbda6d519a11c2c211afb8d46f9ea1a2676bc3 commit)

diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index dbe158e..f105592 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -907,7 +907,7 @@ configServerFlags(XF86ConfFlagsPtr flags
     xf86GetOptValBool(FlagOptions, FLAG_ALLOW_CLOSEDOWN_GRABS,
 		      &(xf86Info.grabInfo.allowClosedown));
     xf86GetOptValBool(FlagOptions, FLAG_IGNORE_ABI, &xf86Info.ignoreABI);
-    if (&xf86Info.ignoreABI) {
+    if (xf86Info.ignoreABI) {
 	    xf86Msg(X_CONFIG, "Ignoring ABI Version\n");
     }