diff options
author | s.hauer@pengutronix.de <s.hauer@pengutronix.de> | 2006-11-02 07:56:04 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-11-12 22:44:58 -0500 |
commit | a7a1ed305043961ed06e0ee5e7a4a2cc1250f4b5 (patch) | |
tree | 85cd901113b6aee1890facf8468c72a9de176315 /arch/powerpc/kernel/entry_64.S | |
parent | 68e1300a55310a288b87f2a7d6045df0d0f802bc (diff) |
[PATCH] Remove occurences of PPC_MULTIPLATFORM in head_64.S
Since iSeries is merged to MULTIPLATFORM, there is no way to build a 64bit
kernel without MULTIPLATFORM, so PPC_MULTIPLATFORM can be removed in
64bit-only files.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/entry_64.S')
-rw-r--r-- | arch/powerpc/kernel/entry_64.S | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S index 86e2bdd5afd6..ec754c92ba94 100644 --- a/arch/powerpc/kernel/entry_64.S +++ b/arch/powerpc/kernel/entry_64.S | |||
@@ -736,8 +736,6 @@ _STATIC(rtas_restore_regs) | |||
736 | 736 | ||
737 | #endif /* CONFIG_PPC_RTAS */ | 737 | #endif /* CONFIG_PPC_RTAS */ |
738 | 738 | ||
739 | #ifdef CONFIG_PPC_MULTIPLATFORM | ||
740 | |||
741 | _GLOBAL(enter_prom) | 739 | _GLOBAL(enter_prom) |
742 | mflr r0 | 740 | mflr r0 |
743 | std r0,16(r1) | 741 | std r0,16(r1) |
@@ -822,5 +820,3 @@ _GLOBAL(enter_prom) | |||
822 | ld r0,16(r1) | 820 | ld r0,16(r1) |
823 | mtlr r0 | 821 | mtlr r0 |
824 | blr | 822 | blr |
825 | |||
826 | #endif /* CONFIG_PPC_MULTIPLATFORM */ | ||