diff --git a/[refs] b/[refs]
index 8225d5fcddec..902a204facce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c0b461e4c8fde467bd803e368d9a78ec2da5f8a
+refs/heads/master: b6b5244e4f1ccf838cce8499732449f26c119b88
diff --git a/trunk/drivers/staging/csr/csr_time.c b/trunk/drivers/staging/csr/csr_time.c
index 1ef61e3efac6..9e5aa9002b66 100644
--- a/trunk/drivers/staging/csr/csr_time.c
+++ b/trunk/drivers/staging/csr/csr_time.c
@@ -26,11 +26,11 @@
 CsrTime CsrTimeGet(CsrTime *high)
 {
     struct timespec ts;
-    CsrUint64 time;
+    u64 time;
     CsrTime low;
 
     ts = current_kernel_time();
-    time = (CsrUint64) ts.tv_sec * 1000000 + ts.tv_nsec / 1000;
+    time = (u64) ts.tv_sec * 1000000 + ts.tv_nsec / 1000;
 
     if (high != NULL)
     {
@@ -46,10 +46,10 @@ EXPORT_SYMBOL_GPL(CsrTimeGet);
 void CsrTimeUtcGet(CsrTimeUtc *tod, CsrTime *low, CsrTime *high)
 {
     struct timespec ts;
-    CsrUint64 time;
+    u64 time;
 
     ts = current_kernel_time();
-    time = (CsrUint64) ts.tv_sec * 1000000 + ts.tv_nsec / 1000;
+    time = (u64) ts.tv_sec * 1000000 + ts.tv_nsec / 1000;
 
     if (high != NULL)
     {
diff --git a/trunk/drivers/staging/csr/csr_types.h b/trunk/drivers/staging/csr/csr_types.h
index 76f95615033e..7018c0a708d2 100644
--- a/trunk/drivers/staging/csr/csr_types.h
+++ b/trunk/drivers/staging/csr/csr_types.h
@@ -26,19 +26,6 @@ extern "C" {
 #undef  TRUE
 #define TRUE (1)
 
-/*
- * 64-bit integers
- *
- * Note: If a given compiler does not support 64-bit types, it is
- * OK to omit these definitions;  32-bit versions of the code using
- * these types may be available.  Consult the relevant documentation
- * or the customer support group for information on this.
- */
-#define CSR_HAVE_64_BIT_INTEGERS
-typedef uint64_t CsrUint64;
-typedef int64_t CsrInt64;
-
-
 #ifdef __cplusplus
 }
 #endif