Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

[linux-2.6] / arch / powerpc / platforms / cell / Kconfig

diff --git a/arch/powerpc/platforms/cell/Kconfig b/arch/powerpc/platforms/cell/Kconfig
index 0c8c7b6ab897657866c37212195f87acba59a860..82551770917c5e7fb66eec807550b18d4b5e029b 100644 (file)
--- a/arch/powerpc/platforms/cell/Kconfig
+++ b/arch/powerpc/platforms/cell/Kconfig
@@ -1,3 +1,26 @@
+config PPC_CELL
+       bool
+       default n
+
+config PPC_CELL_NATIVE
+       bool
+       select PPC_CELL
+       select PPC_DCR_MMIO
+       select PPC_OF_PLATFORM_PCI
+       select PPC_INDIRECT_IO
+       select PPC_NATIVE
+       select MPIC
+       default n
+
+config PPC_IBM_CELL_BLADE
+       bool "IBM Cell Blade"
+       depends on PPC_MULTIPLATFORM && PPC64
+       select PPC_CELL_NATIVE
+       select PPC_RTAS
+       select MMIO_NVRAM
+       select PPC_UDBG_16550
+       select UDBG_RTAS_CONSOLE
+
 menu "Cell Broadband Engine options"
        depends on PPC_CELL
 
@@ -16,13 +39,23 @@ config SPU_BASE
        bool
        default n
 
-config SPUFS_MMAP
-       bool
-       depends on SPU_FS && SPARSEMEM
-       default y
-
 config CBE_RAS
        bool "RAS features for bare metal Cell BE"
+       depends on PPC_CELL_NATIVE
        default y
 
+config CBE_THERM
+       tristate "CBE thermal support"
+       default m
+       depends on CBE_RAS
+
+config CBE_CPUFREQ
+       tristate "CBE frequency scaling"
+       depends on CBE_RAS && CPU_FREQ
+       default m
+       help
+         This adds the cpufreq driver for Cell BE processors.
+         For details, take a look at <file:Documentation/cpu-freq/>.
+         If you don't have such processor, say N
+
 endmenu