diff options
Diffstat (limited to 'arch/powerpc/kernel/setup_32.c')
-rw-r--r-- | arch/powerpc/kernel/setup_32.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c index 676f894c3380..e39f830317a8 100644 --- a/arch/powerpc/kernel/setup_32.c +++ b/arch/powerpc/kernel/setup_32.c | |||
@@ -53,9 +53,6 @@ | |||
53 | extern void platform_init(void); | 53 | extern void platform_init(void); |
54 | extern void bootx_init(unsigned long r4, unsigned long phys); | 54 | extern void bootx_init(unsigned long r4, unsigned long phys); |
55 | 55 | ||
56 | extern void ppc6xx_idle(void); | ||
57 | extern void power4_idle(void); | ||
58 | |||
59 | boot_infos_t *boot_infos; | 56 | boot_infos_t *boot_infos; |
60 | struct ide_machdep_calls ppc_ide_md; | 57 | struct ide_machdep_calls ppc_ide_md; |
61 | 58 | ||
@@ -194,7 +191,9 @@ void __init machine_init(unsigned long dt_ptr, unsigned long phys) | |||
194 | platform_init(); | 191 | platform_init(); |
195 | 192 | ||
196 | #ifdef CONFIG_6xx | 193 | #ifdef CONFIG_6xx |
197 | ppc_md.power_save = ppc6xx_idle; | 194 | if (cpu_has_feature(CPU_FTR_CAN_DOZE) || |
195 | cpu_has_feature(CPU_FTR_CAN_NAP)) | ||
196 | ppc_md.power_save = ppc6xx_idle; | ||
198 | #endif | 197 | #endif |
199 | 198 | ||
200 | if (ppc_md.progress) | 199 | if (ppc_md.progress) |