diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-01-20 18:20:47 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-01-20 18:20:47 -0800 |
| commit | ccaae273c3f92d7e7acb796d6747077a93dcca4b (patch) | |
| tree | 3b3853db3d4b0db18c9cbc51469538aa767aeaee /arch/arm/mach-omap2/cpuidle34xx.c | |
| parent | fa8d1d6c2a72659f773f919c4356b68884c875d0 (diff) | |
| parent | 6b34f9d4e60a4fb9f847533a207e31316603e840 (diff) | |
| download | kernel_samsung_smdk4412-ccaae273c3f92d7e7acb796d6747077a93dcca4b.zip kernel_samsung_smdk4412-ccaae273c3f92d7e7acb796d6747077a93dcca4b.tar.gz kernel_samsung_smdk4412-ccaae273c3f92d7e7acb796d6747077a93dcca4b.tar.bz2 | |
Merge branch 'pm-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-fixes-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/cpuidle34xx.c')
| -rw-r--r-- | arch/arm/mach-omap2/cpuidle34xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/cpuidle34xx.c b/arch/arm/mach-omap2/cpuidle34xx.c index a26d6a0..12f0cbf 100644 --- a/arch/arm/mach-omap2/cpuidle34xx.c +++ b/arch/arm/mach-omap2/cpuidle34xx.c @@ -137,7 +137,7 @@ return_sleep_time: local_irq_enable(); local_fiq_enable(); - return (u32)timespec_to_ns(&ts_idle)/1000; + return ts_idle.tv_nsec / NSEC_PER_USEC + ts_idle.tv_sec * USEC_PER_SEC; } /** |