git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.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
..
a417390
100644
(file)
--- a/
arch/powerpc/platforms/powermac/time.c
+++ b/
arch/powerpc/platforms/powermac/time.c
@@
-9,7
+9,6
@@
* Copyright (C) 2003-2005 Benjamin Herrenschmidt.
*
*/
* Copyright (C) 2003-2005 Benjamin Herrenschmidt.
*
*/
-#include <linux/config.h>
#include <linux/errno.h>
#include <linux/sched.h>
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/sched.h>
#include <linux/kernel.h>
@@
-336,10
+335,10
@@
static struct pmu_sleep_notifier time_sleep_notifier = {
*/
void __init pmac_calibrate_decr(void)
{
*/
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);
/* XXX why here? */
pmu_register_sleep_notifier(&time_sleep_notifier);
-#endif
/* CONFIG_PM */
+#endif
generic_calibrate_decr();
generic_calibrate_decr();