summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/configs/mpc85xx_smp_defconfig
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-12-08 13:20:34 +1100
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-12-08 13:20:34 +1100
commitfaa8bf8878636e40646d307e0516dbadb3b65b4f (patch)
tree2f9736f1ec827ad80a3fd61af5846e664ded2ab1 /arch/powerpc/configs/mpc85xx_smp_defconfig
parent48b1bf86c308532669571e929619e98a8d88ef54 (diff)
parent1f6820b4c1d09b017625ce32ba23fa39ebfdb27a (diff)
Merge branch 'booke-hugetlb' into next
Diffstat (limited to 'arch/powerpc/configs/mpc85xx_smp_defconfig')
-rw-r--r--arch/powerpc/configs/mpc85xx_smp_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/configs/mpc85xx_smp_defconfig b/arch/powerpc/configs/mpc85xx_smp_defconfig
index dd1e41386c4..c0a957429f9 100644
--- a/arch/powerpc/configs/mpc85xx_smp_defconfig
+++ b/arch/powerpc/configs/mpc85xx_smp_defconfig
@@ -183,6 +183,7 @@ CONFIG_VFAT_FS=y
CONFIG_NTFS_FS=y
CONFIG_PROC_KCORE=y
CONFIG_TMPFS=y
+CONFIG_HUGETLBFS=y
CONFIG_ADFS_FS=m
CONFIG_AFFS_FS=m
CONFIG_HFS_FS=m