xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/common/xf86Globals.c |    1 -
 hw/xfree86/common/xf86Privstr.h |    3 ---
 2 files changed, 4 deletions(-)

New commits:
commit 9f08ffc557b52e2e8cd54fb692b66700c83d61c6
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Aug 19 10:29:23 2008 -0400

    Remove unused xf86Info.pMouse

diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
index 3052149..dabcd3d 100644
--- a/hw/xfree86/common/xf86Globals.c
+++ b/hw/xfree86/common/xf86Globals.c
@@ -99,7 +99,6 @@ xf86InfoRec xf86Info = {
 	-1,		/* vtno */
 	FALSE,		/* vtSysreq */
 	SKWhenNeeded,	/* ddxSpecialKeys */
-	NULL,		/* pMouse */
 	-1,		/* lastEventTime */
 	FALSE,		/* vtRequestsPending */
 	FALSE,		/* dontVTSwitch */
diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h
index 12c700a..6a7a6dc 100644
--- a/hw/xfree86/common/xf86Privstr.h
+++ b/hw/xfree86/common/xf86Privstr.h
@@ -67,9 +67,6 @@ typedef struct {
     Bool		vtSysreq;
     SpecialKeysInDDX	ddxSpecialKeys;
 
-    /* mouse part */
-    DeviceIntPtr	pMouse;
-
     /* event handler part */
     int			lastEventTime;
     Bool		vtRequestsPending;