diff --git a/[refs] b/[refs] index 04406cf1a861..0613b4b7551c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b6a9ad73897acb7ea4cf56aae0fc39ba1c471fba +refs/heads/master: a46206e74e1897bf34d6b58f0991a0d6f3797e27 diff --git a/trunk/drivers/s390/cio/qdio.c b/trunk/drivers/s390/cio/qdio.c index 533f90c05cdf..381f339e3200 100644 --- a/trunk/drivers/s390/cio/qdio.c +++ b/trunk/drivers/s390/cio/qdio.c @@ -112,7 +112,7 @@ qdio_min(int a,int b) /***************** SCRUBBER HELPER ROUTINES **********************/ -static inline volatile __u64 +static inline __u64 qdio_get_micros(void) { return (get_clock() >> 10); /* time>>12 is microseconds */