git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Pull novell-bugzilla-156426 into release branch
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
powermac
/
time.c
diff --git
a/arch/powerpc/platforms/powermac/time.c
b/arch/powerpc/platforms/powermac/time.c
index
5d9afa1
..
890758a
100644
(file)
--- a/
arch/powerpc/platforms/powermac/time.c
+++ b/
arch/powerpc/platforms/powermac/time.c
@@
-336,10
+336,10
@@
static struct pmu_sleep_notifier time_sleep_notifier = {
*/
void __init pmac_calibrate_decr(void)
{
-#if
def CONFIG_PM
+#if
defined(CONFIG_PM) && defined(CONFIG_ADB_PMU)
/* XXX why here? */
pmu_register_sleep_notifier(&time_sleep_notifier);
-#endif
/* CONFIG_PM */
+#endif
generic_calibrate_decr();