From 40e2d2d564085d561970f79ba2d07d43751ff58d Mon Sep 17 00:00:00 2001
From: Kevin McKinney <klmckinney1@gmail.com>
Date: Thu, 22 Nov 2012 14:48:34 -0500
Subject: [PATCH] --- yaml --- r: 338159 b: refs/heads/master c:
 15b18b465c1cb78f20efcbfabaf51f8940eaf2ab h: refs/heads/master i:   338157:
 3c070f6e0b1197001ad4f72b40c3dcb1a19231dc   338155:
 22711ba54014800636a02951ea38bb223cbd09e6   338151:
 c713885a702dbffb62cfa6dd89c2a8dd3ab95576   338143:
 c2fad149d08eb068b153a3332164adca83123e21 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 428d60d1baae..a60f0f7ed677 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b512e49e1632925e97ee9f4b56bab8ff373dc02
+refs/heads/master: 15b18b465c1cb78f20efcbfabaf51f8940eaf2ab
diff --git a/trunk/drivers/staging/bcm/Ioctl.h b/trunk/drivers/staging/bcm/Ioctl.h
index e6d2d599208a..aa3047809276 100644
--- a/trunk/drivers/staging/bcm/Ioctl.h
+++ b/trunk/drivers/staging/bcm/Ioctl.h
@@ -209,7 +209,7 @@ typedef struct _FLASH2X_BITMAP {
 } FLASH2X_BITMAP, *PFLASH2X_BITMAP;
 
 typedef struct _ST_TIME_ELAPSED_ {
-	ULONG64	ul64TimeElapsedSinceNetEntry;
+	unsigned long long ul64TimeElapsedSinceNetEntry;
 	UINT32  uiReserved[4];
 } ST_TIME_ELAPSED, *PST_TIME_ELAPSED;