commit bbac30edb39a80426e4a3420a5ec635eb4466f63
author Len Brown <len.brown@intel.com> Thu Jul 22 18:19:12 2010 -0400
committer Len Brown <len.brown@intel.com> Thu Jul 22 18:19:12 2010 -0400
tree 2c69ae7372ba4695e32218e866baa27910f5a928
parent 4a973f2495fba8775d1c408b3ee7f2c19b19f13f
parent 6c9c0fd062a6540dbee233151679b5f03ce433d9

Merge branch 'misc' into release

drivers/acpi/processor_idle.c

diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 1d41048..e9a8026 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -82,10 +82,13 @@
 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.