Merge branch 'misc' into release

mariux64 · Jul 22, 2010 · bbac30e · bbac30e
2 parents 4a973f2 + 6c9c0fd
commit bbac30e
Showing 1 changed file with 3 additions and 0 deletions.
diff --git 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.