---

yaml --- r: 324469 b: refs/heads/master c: 02c4be0 h: refs/heads/master i: 324467: ef0abef v: v3
git-mirror · Aug 14, 2012 · 5c49121 · 5c49121
1 parent 86c81a9
commit 5c49121
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c4a12718df3bf67c86d6d372564ab688cbfe7a3
+refs/heads/master: 02c4be05d9718d5d0f45db39cbef8a927ff4ebb8
diff --git a/trunk/drivers/staging/csr/csr_time.c b/trunk/drivers/staging/csr/csr_time.c
@@ -24,20 +24,18 @@
 
 CsrTime CsrTimeGet(CsrTime *high)
 {
-    struct timespec ts;
-    u64 time;
-    CsrTime low;
+	struct timespec ts;
+	u64 time;
+	CsrTime low;
 
-    ts = current_kernel_time();
-    time = (u64) ts.tv_sec * 1000000 + ts.tv_nsec / 1000;
+	ts = current_kernel_time();
+	time = (u64) ts.tv_sec * 1000000 + ts.tv_nsec / 1000;
 
-    if (high != NULL)
-    {
-        *high = (CsrTime) ((time >> 32) & 0xFFFFFFFF);
-    }
+	if (high != NULL)
+		*high = (CsrTime) ((time >> 32) & 0xFFFFFFFF);
 
-    low = (CsrTime) (time & 0xFFFFFFFF);
+	low = (CsrTime) (time & 0xFFFFFFFF);
 
-    return low;
+	return low;
 }
 EXPORT_SYMBOL_GPL(CsrTimeGet);