projects
/
linux-2.6-microblaze.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
4a973f2
)
Merge branch 'misc' into release
author
Len Brown
<len.brown@intel.com>
Thu, 22 Jul 2010 22:19:12 +0000
(18:19 -0400)
committer
Len Brown
<len.brown@intel.com>
Thu, 22 Jul 2010 22:19:12 +0000
(18:19 -0400)
drivers/acpi/processor_idle.c
patch
|
blob
|
history
diff --git
a/drivers/acpi/processor_idle.c
b/drivers/acpi/processor_idle.c
index
1d41048
..
e9a8026
100644
(file)
--- 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.