From 25221a6fcfb29368c25af94321a8e0883bff6802 Mon Sep 17 00:00:00 2001
From: Kevin McKinney <klmckinney1@gmail.com>
Date: Thu, 22 Nov 2012 14:48:37 -0500
Subject: [PATCH] --- yaml --- r: 338162 b: refs/heads/master c:
 73f44785b3aa77afd1771f5151d204f99d24faea h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/staging/bcm/Ioctl.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index dc780e155053..39712c11bb10 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2314894f5c80abfbda3cad3519cc28aa0184bb76
+refs/heads/master: 73f44785b3aa77afd1771f5151d204f99d24faea
diff --git a/trunk/drivers/staging/bcm/Ioctl.h b/trunk/drivers/staging/bcm/Ioctl.h
index 6a361e547868..ce10ea44cdd9 100644
--- a/trunk/drivers/staging/bcm/Ioctl.h
+++ b/trunk/drivers/staging/bcm/Ioctl.h
@@ -210,7 +210,7 @@ typedef struct _FLASH2X_BITMAP {
 
 typedef struct _ST_TIME_ELAPSED_ {
 	unsigned long long ul64TimeElapsedSinceNetEntry;
-	UINT32  uiReserved[4];
+	u32  uiReserved[4];
 } ST_TIME_ELAPSED, *PST_TIME_ELAPSED;
 
 enum {