From 3c4f93e460f2af2a0955b37e083b1dda298e1ef2 Mon Sep 17 00:00:00 2001
From: Kevin McKinney <klmckinney1@gmail.com>
Date: Mon, 3 Dec 2012 22:36:24 -0500
Subject: [PATCH] --- yaml --- r: 353757 b: refs/heads/master c:
 1fb14c4276fb59f3523fc33a1acf63c1af64f793 h: refs/heads/master i:   353755:
 6119dc9667502cb2d6c10ae7d388d3d375829a71 v: v3

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

diff --git a/[refs] b/[refs]
index b20314ca5a91..c57356b46394 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 44d8311272c0d67ce135fc5cc985ff6f399a75a5
+refs/heads/master: 1fb14c4276fb59f3523fc33a1acf63c1af64f793
diff --git a/trunk/drivers/staging/bcm/Ioctl.h b/trunk/drivers/staging/bcm/Ioctl.h
index 8c70af90969b..8650d132d2b1 100644
--- a/trunk/drivers/staging/bcm/Ioctl.h
+++ b/trunk/drivers/staging/bcm/Ioctl.h
@@ -202,8 +202,8 @@ struct bcm_flash2x_bitmap {
 };
 
 struct bcm_time_elapsed {
-	unsigned long long ul64TimeElapsedSinceNetEntry;
-	u32  uiReserved[4];
+	u64 ul64TimeElapsedSinceNetEntry;
+	u32 uiReserved[4];
 };
 
 enum {