Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspe...

[mv-sheeva.git] / mm / Kconfig

diff --git a/mm/Kconfig b/mm/Kconfig
index 3e81687263b5e6592777865b30e994094f5f08e8..e9c0c61f2ddd0881bbb9dee37d3384dae0146ece 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -179,7 +179,7 @@ config SPLIT_PTLOCK_CPUS
 config COMPACTION
        bool "Allow for memory compaction"
        select MIGRATION
-       depends on EXPERIMENTAL && HUGETLB_PAGE && MMU
+       depends on MMU
        help
          Allows the compaction of memory for the allocation of huge pages.
 
@@ -305,6 +305,7 @@ config NOMMU_INITIAL_TRIM_EXCESS
 config TRANSPARENT_HUGEPAGE
        bool "Transparent Hugepage Support"
        depends on X86 && MMU
+       select COMPACTION
        help
          Transparent Hugepages allows the kernel to use huge pages and
          huge tlb transparently to the applications whenever possible.