diff options
Diffstat (limited to 'arch/powerpc/kernel/cpu_setup_44x.S')
-rw-r--r-- | arch/powerpc/kernel/cpu_setup_44x.S | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/powerpc/kernel/cpu_setup_44x.S b/arch/powerpc/kernel/cpu_setup_44x.S index 5465e8de0e61..80cac984d85d 100644 --- a/arch/powerpc/kernel/cpu_setup_44x.S +++ b/arch/powerpc/kernel/cpu_setup_44x.S | |||
@@ -39,12 +39,6 @@ _GLOBAL(__setup_cpu_440gx) | |||
39 | _GLOBAL(__setup_cpu_440spe) | 39 | _GLOBAL(__setup_cpu_440spe) |
40 | b __fixup_440A_mcheck | 40 | b __fixup_440A_mcheck |
41 | 41 | ||
42 | /* Temporary fixup for arch/ppc until we kill the whole thing */ | ||
43 | #ifndef CONFIG_PPC_MERGE | ||
44 | _GLOBAL(__fixup_440A_mcheck) | ||
45 | blr | ||
46 | #endif | ||
47 | |||
48 | /* enable APU between CPU and FPU */ | 42 | /* enable APU between CPU and FPU */ |
49 | _GLOBAL(__init_fpu_44x) | 43 | _GLOBAL(__init_fpu_44x) |
50 | mfspr r3,SPRN_CCR0 | 44 | mfspr r3,SPRN_CCR0 |