xserver: Branch 'server-1_1-branch'

[Adam Jackson]

 hw/xfree86/os-support/linux/lnx_mouse.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 702bf1757262f2895383c60b8a2237aade6fa1f7 (from f54b21cc67b588984c1d05c471f56b0f758d86f7)
Author: Adam Jackson <ajax at benzedrine.nwnk.net>
Date:   Thu Jul 6 17:39:14 2006 -0400

    Switch the default mouse device on Linux to /dev/input/mice.
    (cherry picked from d7a96dd6f18e54c26fc5881772d033ac078db3a1 commit)

diff --git a/hw/xfree86/os-support/linux/lnx_mouse.c b/hw/xfree86/os-support/linux/lnx_mouse.c
index afd2160..ae4bddd 100644
--- a/hw/xfree86/os-support/linux/lnx_mouse.c
+++ b/hw/xfree86/os-support/linux/lnx_mouse.c
@@ -29,7 +29,7 @@ DefaultProtocol(void)
     return "Auto";
 }
 
-#define DEFAULT_MOUSE_DEV		"/dev/mouse"
+#define DEFAULT_MOUSE_DEV		"/dev/input/mice"
 #define DEFAULT_PS2_DEV			"/dev/psaux"
 #define DEFAULT_GPM_DATA_DEV		"/dev/gpmdata"
 #define DEFAULT_GPM_CTL_DEV		"/dev/gpmdata"