Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee13...

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

diff --git a/arch/powerpc/platforms/cell/Kconfig b/arch/powerpc/platforms/cell/Kconfig
index 352bbba..3e430b4 100644 (file)
--- a/arch/powerpc/platforms/cell/Kconfig
+++ b/arch/powerpc/platforms/cell/Kconfig
@@ -6,6 +6,7 @@ config SPU_FS
        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
@@ -15,12 +16,6 @@ config SPU_BASE
        bool
        default n
 
-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