xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/common/xf86Configure.c |    3 +++
 1 files changed, 3 insertions(+)

New commits:
diff-tree 43e42eef1f5a22703eb64fc9cffecde036ea38e0 (from 7da51447eaab34292e14077fb5a48e6b2e587781)
Author: Adam Jackson <ajax at benzedrine.nwnk.net>
Date:   Thu Aug 17 16:22:07 2006 -0400

    Fix default mouse device on Linux, again.
    
    It would be really nice if we only did this in one place instead of 40.

diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c
index f0efa62..cb09108 100644
--- a/hw/xfree86/common/xf86Configure.c
+++ b/hw/xfree86/common/xf86Configure.c
@@ -87,6 +87,9 @@ static char *DFLT_MOUSE_DEV = "/dev/devi
 #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
 static char *DFLT_MOUSE_DEV = "/dev/sysmouse";
 static char *DFLT_MOUSE_PROTO = "auto";
+#elif defined(linux)
+static char DFLT_MOUSE_DEV[] = "/dev/input/mice";
+static char DFLT_MOUSE_PROTO[] = "auto";
 #else
 static char *DFLT_MOUSE_DEV = "/dev/mouse";
 static char *DFLT_MOUSE_PROTO = "auto";