From 0874ae23a16946781dd517cfdb011c691ad0b581 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Wed, 5 May 2010 09:43:03 +0000
Subject: svn merge -r571:HEAD "^/branches/released" .

---
 xorg-server/include/inputstr.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'xorg-server/include/inputstr.h')

diff --git a/xorg-server/include/inputstr.h b/xorg-server/include/inputstr.h
index de4026cb7..6da3f38e4 100644
--- a/xorg-server/include/inputstr.h
+++ b/xorg-server/include/inputstr.h
@@ -514,8 +514,9 @@ typedef struct _DeviceIntRec {
     LedFeedbackPtr	leds;
     struct _XkbInterest *xkb_interest;
     char                *config_info; /* used by the hotplug layer */
+    ClassesPtr		unused_classes; /* for master devices */
+    int			saved_master_id;	/* for slaves while grabbed */
     PrivateRec		*devPrivates;
-    int			nPrivates;
     DeviceUnwrapProc    unwrapProc;
     SpriteInfoPtr       spriteInfo;
     union {
-- 
cgit v1.2.3