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 */ } /*