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;