From 9bcc15d2208b26dc7a31d8f13ab12d1cd64d0973 Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Mon, 4 Mar 2013 20:42:00 +0100
Subject: [PATCH] --- yaml --- r: 361220 b: refs/heads/master c:
 aa1e1234826e21197f818ca0abf519775ad4eb5c h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 01a424ffb871..dd5cb7fe1f7e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b5ae11463a67a5e468dd67482ab2308994da9b2b
+refs/heads/master: aa1e1234826e21197f818ca0abf519775ad4eb5c
diff --git a/trunk/drivers/staging/vt6656/card.c b/trunk/drivers/staging/vt6656/card.c
index 22918a106d73..d2479b766450 100644
--- a/trunk/drivers/staging/vt6656/card.c
+++ b/trunk/drivers/staging/vt6656/card.c
@@ -790,7 +790,7 @@ u64 CARDqGetNextTBTT(u64 qwTSF, WORD wBeaconInterval)
 	if ((~uLowNextTBTT) < uLowRemain)
 		qwTSF = ((qwTSF >> 32) + 1) << 32;
 
-	qwTSF = (qwTSF & 0xffffffff00000000UL) |
+	qwTSF = (qwTSF & 0xffffffff00000000ULL) |
 		(u64)(uLowNextTBTT + uLowRemain);
 
     return (qwTSF);