Merge branch 'misc' into release

lenb · lenb · commit bbac30edb39a · 2010-07-22T18:19:12.000-04:00
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.

Original file line number	Diff line number	Diff line change
`@@ -82,10 +82,13 @@ module_param(bm_check_disable, uint, 0000);`
`82`	`82`	`static unsigned int latency_factor __read_mostly = 2;`
`83`	`83`	`module_param(latency_factor, uint, 0644);`
`84`	`84`
	`85`	`+#ifdef CONFIG_ACPI_PROCFS`
`85`	`86`	`static u64 us_to_pm_timer_ticks(s64 t)`
`86`	`87`	`{`
`87`	`88`	`return div64_u64(t * PM_TIMER_FREQUENCY, 1000000);`
`88`	`89`	`}`
	`90`	`+#endif`
	`91`	`+`
`89`	`92`	`/*`
`90`	`93`	`* IBM ThinkPad R40e crashes mysteriously when going into C2 or C3.`
`91`	`94`	`* For now disable this. Probably a bug somewhere else.`