diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-12-14 13:23:03 -0500 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-12-14 13:23:03 -0500 |
| commit | 559300bc0ef7ccd541656f1189d38e7088389559 (patch) | |
| tree | cd1682881ca4246e9c5a1e8632be4bdd9d9706c6 /arch/powerpc/Kconfig | |
| parent | 5416bf33f92a4104dbcd6062bf377c8421ca3cfd (diff) | |
| parent | 22763c5cf3690a681551162c15d34d935308c8d7 (diff) | |
Merge commit 'v2.6.32'
Conflicts:
arch/avr32/mach-at32ap/include/mach/cpu.h
Diffstat (limited to 'arch/powerpc/Kconfig')
| -rw-r--r-- | arch/powerpc/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 10a0a5488a44..2ba14e77296c 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
| @@ -414,6 +414,10 @@ config ARCH_SPARSEMEM_DEFAULT | |||
| 414 | config ARCH_POPULATES_NODE_MAP | 414 | config ARCH_POPULATES_NODE_MAP |
| 415 | def_bool y | 415 | def_bool y |
| 416 | 416 | ||
| 417 | config SYS_SUPPORTS_HUGETLBFS | ||
| 418 | def_bool y | ||
| 419 | depends on PPC_BOOK3S_64 | ||
| 420 | |||
| 417 | source "mm/Kconfig" | 421 | source "mm/Kconfig" |
| 418 | 422 | ||
| 419 | config ARCH_MEMORY_PROBE | 423 | config ARCH_MEMORY_PROBE |