From 8a09ffddba059c2cfc08bf686d49d4ab87caf97a Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 12 Jun 2012 11:10:50 -0700
Subject: [PATCH] --- yaml --- r: 311157 b: refs/heads/master c:
 1b8487368bb0acedf23e226974b63aaaf2bfddbd h: refs/heads/master i:   311155:
 5b02d97e14dd485fbfc0aff109eda85c5720b8a0 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/staging/usbip/vhci_hcd.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d3ad5da2e1b0..f6a583501ed3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 08224262adefb5e6460888b2490a96e1bc28aef5
+refs/heads/master: 1b8487368bb0acedf23e226974b63aaaf2bfddbd
diff --git a/trunk/drivers/staging/usbip/vhci_hcd.c b/trunk/drivers/staging/usbip/vhci_hcd.c
index 117a7ad9fdb1..f708cbaee16b 100644
--- a/trunk/drivers/staging/usbip/vhci_hcd.c
+++ b/trunk/drivers/staging/usbip/vhci_hcd.c
@@ -205,7 +205,7 @@ static int vhci_hub_status(struct usb_hcd *hcd, char *buf)
 	int		retval = 0;
 
 	/* the enough buffer is allocated according to USB_MAXCHILDREN */
-	u32		*event_bits = (unsigned long *) buf;
+	unsigned long	*event_bits = (unsigned long *) buf;
 	int		rhport;
 	int		changed = 0;