Merge ../linus

[pandora-kernel.git] / arch / powerpc / platforms / cell / Kconfig

diff --git a/arch/powerpc/platforms/cell/Kconfig b/arch/powerpc/platforms/cell/Kconfig
index 6a02d51..0c8c7b6 100644 (file)
--- a/arch/powerpc/platforms/cell/Kconfig
+++ b/arch/powerpc/platforms/cell/Kconfig
@@ -5,15 +5,24 @@ config SPU_FS
        tristate "SPU file system"
        default m
        depends on PPC_CELL
        tristate "SPU file system"
        default m
        depends on PPC_CELL

+       select SPU_BASE
+       select MEMORY_HOTPLUG

        help
          The SPU file system is used to access Synergistic Processing
          Units on machines implementing the Broadband Processor
          Architecture.
 
        help
          The SPU file system is used to access Synergistic Processing
          Units on machines implementing the Broadband Processor
          Architecture.
 

+config SPU_BASE
+       bool
+       default n
+

 config SPUFS_MMAP
        bool
        depends on SPU_FS && SPARSEMEM
 config SPUFS_MMAP
        bool
        depends on SPU_FS && SPARSEMEM

-       select MEMORY_HOTPLUG
+       default y
+
+config CBE_RAS
+       bool "RAS features for bare metal Cell BE"

        default y
 
 endmenu
        default y
 
 endmenu