From a6620c5f7da1be98a15adafa7dcf40339dd6ef52 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed, 2 Mar 2011 19:36:15 -0800
Subject: [PATCH] --- yaml --- r: 236257 b: refs/heads/master c:
 2012d40dbda6f87537535bad38ccd84f8805de9e h: refs/heads/master i:   236255:
 c7ca0c6d5e44508b78c9d0731991199a41723a96 v: v3

---
 [refs]                              |  2 +-
 trunk/drivers/staging/hv/hv_mouse.c | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index eb10779d30dd..83601b51102d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7fa1a4629cd94e249b1556f58030174601ddbc4
+refs/heads/master: 2012d40dbda6f87537535bad38ccd84f8805de9e
diff --git a/trunk/drivers/staging/hv/hv_mouse.c b/trunk/drivers/staging/hv/hv_mouse.c
index b8760da1ebe7..d8945bb61272 100644
--- a/trunk/drivers/staging/hv/hv_mouse.c
+++ b/trunk/drivers/staging/hv/hv_mouse.c
@@ -145,7 +145,7 @@ enum pipe_prot_msg_type {
 
 
 struct pipe_prt_msg {
-	enum pipe_prot_msg_type PacketType;
+	enum pipe_prot_msg_type type;
 	u32                DataSize;
 	char               Data[1];
 };
@@ -154,7 +154,7 @@ struct pipe_prt_msg {
  * Data types
  */
 struct  mousevsc_prt_msg {
-	enum pipe_prot_msg_type   PacketType;
+	enum pipe_prot_msg_type type;
 	u32                  DataSize;
 	union {
 		struct synthhid_protocol_request Request;
@@ -382,7 +382,7 @@ static void MousevscOnReceiveDeviceInfo(struct mousevsc_dev *InputDevice, struct
 	/* Send the ack */
 	memset(&ack, sizeof(struct mousevsc_prt_msg), 0);
 
-	ack.PacketType = PipeMessageData;
+	ack.type = PipeMessageData;
 	ack.DataSize = sizeof(struct synthhid_device_info_ack);
 
 	ack.Ack.header.type = SynthHidInitialDeviceInfoAck;
@@ -453,9 +453,9 @@ static void MousevscOnReceive(struct hv_device *Device, struct vmpacket_descript
 
 	pipeMsg = (struct pipe_prt_msg *)((unsigned long)Packet + (Packet->offset8 << 3));
 
-	if (pipeMsg->PacketType != PipeMessageData) {
+	if (pipeMsg->type != PipeMessageData) {
 		pr_err("unknown pipe msg type - type %d len %d",
-			   pipeMsg->PacketType, pipeMsg->DataSize);
+			   pipeMsg->type, pipeMsg->DataSize);
 		PutInputDevice(Device);
 		return ;
 	}
@@ -605,7 +605,7 @@ static int MousevscConnectToVsp(struct hv_device *Device)
 	 */
 	memset(request, sizeof(struct mousevsc_prt_msg), 0);
 
-	request->PacketType = PipeMessageData;
+	request->type = PipeMessageData;
 	request->DataSize = sizeof(struct synthhid_protocol_request);
 
 	request->Request.header.type = SynthHidProtocolRequest;