diff options
author | Paul Mackerras <paulus@samba.org> | 2008-02-07 11:21:09 +1100 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-02-07 11:21:09 +1100 |
commit | 1f7d4f8395093021ed2262296179cfe71bd5e2ec (patch) | |
tree | 30c69554b5a249ed5b90c52388165545df154c40 /arch/powerpc/platforms/Kconfig.cputype | |
parent | b370b08274a25cf1e2015fb7ce65c43173c8156f (diff) | |
parent | 25ae3a0739c69425a911925b43213895a9802b98 (diff) | |
download | blackbird-obmc-linux-1f7d4f8395093021ed2262296179cfe71bd5e2ec.tar.gz blackbird-obmc-linux-1f7d4f8395093021ed2262296179cfe71bd5e2ec.zip |
Merge branch 'for-2.6.25' of git://git.secretlab.ca/git/linux-2.6-mpc52xx into for-2.6.25
Diffstat (limited to 'arch/powerpc/platforms/Kconfig.cputype')
-rw-r--r-- | arch/powerpc/platforms/Kconfig.cputype | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype index eea2e7049fed..69941ba70975 100644 --- a/arch/powerpc/platforms/Kconfig.cputype +++ b/arch/powerpc/platforms/Kconfig.cputype @@ -14,7 +14,7 @@ choice There are five families of 32 bit PowerPC chips supported. The most common ones are the desktop and server CPUs (601, 603, 604, 740, 750, 74xx) CPUs from Freescale and IBM, with their - embedded 52xx/82xx/83xx/86xx counterparts. + embedded 512x/52xx/82xx/83xx/86xx counterparts. The other embeeded parts, namely 4xx, 8xx, e200 (55xx) and e500 (85xx) each form a family of their own that is not compatible with the others. @@ -22,7 +22,7 @@ choice If unsure, select 52xx/6xx/7xx/74xx/82xx/83xx/86xx. config 6xx - bool "52xx/6xx/7xx/74xx/82xx/83xx/86xx" + bool "512x/52xx/6xx/7xx/74xx/82xx/83xx/86xx" select PPC_FPU config PPC_85xx @@ -225,7 +225,7 @@ config NR_CPUS config NOT_COHERENT_CACHE bool - depends on 4xx || 8xx || E200 + depends on 4xx || 8xx || E200 || PPC_MPC512x default y config CHECK_CACHE_COHERENCY |