diff options
| author | Len Brown | 2010-07-23 00:19:12 +0200 |
|---|---|---|
| committer | Len Brown | 2010-07-23 00:19:12 +0200 |
| commit | bbac30edb39a80426e4a3420a5ec635eb4466f63 (patch) | |
| tree | 2c69ae7372ba4695e32218e866baa27910f5a928 | |
| parent | Merge branch 'bugzilla-15886' into release (diff) | |
| parent | ACPI: fix unused function warning (diff) | |
| download | kernel-qcow2-linux-bbac30edb39a80426e4a3420a5ec635eb4466f63.tar.gz kernel-qcow2-linux-bbac30edb39a80426e4a3420a5ec635eb4466f63.tar.xz kernel-qcow2-linux-bbac30edb39a80426e4a3420a5ec635eb4466f63.zip | |
Merge branch 'misc' into release
| -rw-r--r-- | drivers/acpi/processor_idle.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index 1d4104855296..e9a8026d39f0 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c @@ -82,10 +82,13 @@ module_param(bm_check_disable, uint, 0000); static unsigned int latency_factor __read_mostly = 2; module_param(latency_factor, uint, 0644); +#ifdef CONFIG_ACPI_PROCFS static u64 us_to_pm_timer_ticks(s64 t) { return div64_u64(t * PM_TIMER_FREQUENCY, 1000000); } +#endif + /* * IBM ThinkPad R40e crashes mysteriously when going into C2 or C3. * For now disable this. Probably a bug somewhere else. |