Merge branch 'misc' into release

This commit is contained in:
Len Brown 2010-07-22 18:19:12 -04:00
commit bbac30edb3
1 changed files with 3 additions and 0 deletions

View File

@ -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.