From e5ee04c465db0000f1e15105c680d49b7160d500 Mon Sep 17 00:00:00 2001
From: Frank Pavlic <fpavlic@de.ibm.com>
Date: Wed, 20 Sep 2006 15:59:03 +0200
Subject: [PATCH] --- yaml --- r: 34171 b: refs/heads/master c:
 47addc84b450fd5e391ab118e178645cb0bbd89d h: refs/heads/master i:   34169:
 19aa59ce44549d3e56c73ca2ee30d00d43513e30   34167:
 940c56452492c2729054b06179062e1fb9c289b3 v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/s390/cio/qdio.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c25ce9b5f9f2..b3d5211bb1e1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d5d688f724dd5a651d1ce7bc3ea7c03d28137a1
+refs/heads/master: 47addc84b450fd5e391ab118e178645cb0bbd89d
diff --git a/trunk/drivers/s390/cio/qdio.c b/trunk/drivers/s390/cio/qdio.c
index 7c93a8798d23..16e3715d5c0d 100644
--- a/trunk/drivers/s390/cio/qdio.c
+++ b/trunk/drivers/s390/cio/qdio.c
@@ -115,7 +115,7 @@ qdio_min(int a,int b)
 static inline __u64 
 qdio_get_micros(void)
 {
-        return (get_clock() >> 10); /* time>>12 is microseconds */
+	return (get_clock() >> 12); /* time>>12 is microseconds */
 }
 
 /*