Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes

[sfrench/cifs-2.6.git] / arch / powerpc / platforms / Kconfig.cputype

diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
index a8aae0b54579a14eed66dc8ac3a5bae2247902e6..d361f8119b1e50680511535f0c373147d8267c43 100644 (file)
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -43,7 +43,7 @@ config 40x
        select PPC_PCI_CHOICE
 
 config 44x
-       bool "AMCC 44x"
+       bool "AMCC 44x, 46x or 47x"
        select PPC_DCR_NATIVE
        select PPC_UDBG_16550
        select 4xx_SOC
@@ -294,7 +294,7 @@ config PPC_PERF_CTRS
          This enables the powerpc-specific perf_event back-end.
 
 config SMP
-       depends on PPC_BOOK3S || PPC_BOOK3E || FSL_BOOKE
+       depends on PPC_BOOK3S || PPC_BOOK3E || FSL_BOOKE || PPC_47x
        bool "Symmetric multi-processing support"
        ---help---
          This enables support for systems with more than one CPU. If you have
@@ -322,6 +322,7 @@ config NR_CPUS
 config NOT_COHERENT_CACHE
        bool
        depends on 4xx || 8xx || E200 || PPC_MPC512x || GAMECUBE_COMMON
+       default n if PPC_47x
        default y
 
 config CHECK_CACHE_COHERENCY