summaryrefslogtreecommitdiff
path: root/hw/xfree86/common/xf86Configure.c
diff options
context:
space:
mode:
authorIan Romanick <idr@us.ibm.com>2007-03-28 08:08:04 -0700
committerIan Romanick <idr@us.ibm.com>2007-03-28 08:08:04 -0700
commit2c6d47108880584f1221ff86c6c8947627f9f607 (patch)
tree64a042f58df056433c430fb0c99735d9e8c0904d /hw/xfree86/common/xf86Configure.c
parentc4fe1bcce1c1e4822e688959b331b47a051d6e0a (diff)
parent85220446359a75ea2c359b418b4051c04eea739c (diff)
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts: hw/xfree86/Makefile.am hw/xfree86/dri/dri.c
Diffstat (limited to 'hw/xfree86/common/xf86Configure.c')
-rw-r--r--hw/xfree86/common/xf86Configure.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c
index 741e46b5b..0b7297511 100644
--- a/hw/xfree86/common/xf86Configure.c
+++ b/hw/xfree86/common/xf86Configure.c
@@ -69,7 +69,7 @@ static int nDevToConfig = 0, CurrentDriver;
_X_EXPORT xf86MonPtr ConfiguredMonitor;
Bool xf86DoConfigurePass1 = TRUE;
-Bool foundMouse = FALSE;
+static Bool foundMouse = FALSE;
#if defined(__UNIXOS2__)
#define DFLT_MOUSE_DEV "mouse$"