aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2010-07-22 18:19:12 -0400
committerLen Brown <len.brown@intel.com>2010-07-22 18:19:12 -0400
commitbbac30edb39a80426e4a3420a5ec635eb4466f63 (patch)
tree2c69ae7372ba4695e32218e866baa27910f5a928
parent4a973f2495fba8775d1c408b3ee7f2c19b19f13f (diff)
parent6c9c0fd062a6540dbee233151679b5f03ce433d9 (diff)
downloadlinux-2.6.34-ux500-bbac30edb39a80426e4a3420a5ec635eb4466f63.tar.gz
Merge branch 'misc' into release
-rw-r--r--drivers/acpi/processor_idle.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 1d410485529..e9a8026d39f 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.