diff options
| author | Len Brown <len.brown@intel.com> | 2005-08-26 22:11:28 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-08-26 22:11:28 -0400 |
| commit | 60cfff3516580f5c782cef4dc28f2974c4df8ed1 (patch) | |
| tree | 30053bcf09c1b77699281ba3a56d8ffb4144966c /drivers/s390 | |
| parent | 89ef1a21a174a4f581a4b6973f9a9f9ee28a9304 (diff) | |
| parent | 212d6d2237f60bc28c1518f8abf9d3ed6c17574a (diff) | |
Auto-update from upstream
Diffstat (limited to 'drivers/s390')
| -rw-r--r-- | drivers/s390/cio/qdio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/cio/qdio.c b/drivers/s390/cio/qdio.c index 533f90c05cd..381f339e320 100644 --- a/drivers/s390/cio/qdio.c +++ b/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 */ |