diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 20:00:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 20:00:53 -0400 |
| commit | 1077682b2f97cee76a79cf38bab3fa022a97d9f8 (patch) | |
| tree | e0e7dff35e3f38b9e360e702903e132c991f3f22 /arch/arm/mach-iop3xx/iop331-time.c | |
| parent | dc9ca2af4917ce4e545fa3eb1d845c555128cabc (diff) | |
| parent | bafa49cc1b800df4748b29e2b038ff029d7c8747 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mach-iop3xx/iop331-time.c')
| -rw-r--r-- | arch/arm/mach-iop3xx/iop331-time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-iop3xx/iop331-time.c b/arch/arm/mach-iop3xx/iop331-time.c index 1a6d9d661e4b..8eddfac7e2b0 100644 --- a/arch/arm/mach-iop3xx/iop331-time.c +++ b/arch/arm/mach-iop3xx/iop331-time.c | |||
| @@ -58,7 +58,7 @@ static unsigned long iop331_gettimeoffset(void) | |||
| 58 | /* | 58 | /* |
| 59 | * Now convert them to usec. | 59 | * Now convert them to usec. |
| 60 | */ | 60 | */ |
| 61 | usec = (unsigned long)(elapsed * (tick_nsec / 1000)) / LATCH; | 61 | usec = (unsigned long)(elapsed / (CLOCK_TICK_RATE/1000000)); |
| 62 | 62 | ||
| 63 | return usec; | 63 | return usec; |
| 64 | } | 64 | } |