diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-10-01 08:43:42 (GMT) |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-10-01 08:43:42 (GMT) |
commit | dc1c1ca3dcd94c545c5e01d7c06b46824d43f4d0 (patch) | |
tree | fa088ac3eae8709dd379deda6f31d5b29197d4c9 /arch/powerpc/Kconfig | |
parent | d96024c688b59d4d1e60dbb0e226964eb758aa01 (diff) | |
download | linux-fsl-qoriq-dc1c1ca3dcd94c545c5e01d7c06b46824d43f4d0.tar.xz |
powerpc: merge idle_power4.S and trapc.s
Use idle_power4.S from ppc64 as we are not going to support
32 bit power4 in the merged tree.
Merge ppc64 traps.c into powerpc traps.c:
use ppc64 versions of exception routine names
(as they don't have StudlyCaps)
make all the versions if die() have the same
prototype
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'arch/powerpc/Kconfig')
-rw-r--r-- | arch/powerpc/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index edfac46..953a74b 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -142,8 +142,8 @@ config POWER4 def_bool y config PPC_FPU - bool - default y if PPC64 + depends on PPC32 + def_bool y config BOOKE bool |