diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-21 00:52:04 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-21 00:52:04 -0400 |
| commit | a02efb906d12c9d4eb2ab7c59049ba9545e5412d (patch) | |
| tree | bf1f6467978ec63a22f42299ecac2ee7f7e73336 /arch/powerpc/Kconfig | |
| parent | 84dfcb4b318463cd4883b6a19937824f49aee564 (diff) | |
| parent | 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff) | |
Merge commit 'origin' into master
Manual merge of:
arch/powerpc/Kconfig
arch/powerpc/include/asm/page.h
Diffstat (limited to 'arch/powerpc/Kconfig')
| -rw-r--r-- | arch/powerpc/Kconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index bbe149c26518..369d93e7377c 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
| @@ -19,6 +19,9 @@ config WORD_SIZE | |||
| 19 | default 64 if PPC64 | 19 | default 64 if PPC64 |
| 20 | default 32 if !PPC64 | 20 | default 32 if !PPC64 |
| 21 | 21 | ||
| 22 | config ARCH_PHYS_ADDR_T_64BIT | ||
| 23 | def_bool PPC64 || PHYS_64BIT | ||
| 24 | |||
| 22 | config MMU | 25 | config MMU |
| 23 | bool | 26 | bool |
| 24 | default y | 27 | default y |
| @@ -224,6 +227,8 @@ config PPC_OF_PLATFORM_PCI | |||
| 224 | 227 | ||
| 225 | source "init/Kconfig" | 228 | source "init/Kconfig" |
| 226 | 229 | ||
| 230 | source "kernel/Kconfig.freezer" | ||
| 231 | |||
| 227 | source "arch/powerpc/sysdev/Kconfig" | 232 | source "arch/powerpc/sysdev/Kconfig" |
| 228 | source "arch/powerpc/platforms/Kconfig" | 233 | source "arch/powerpc/platforms/Kconfig" |
| 229 | 234 | ||