diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-01-04 08:45:56 +0100 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-01-04 08:45:56 +0100 |
commit | 921a220857cdd3c553cde7c114f9f6757ac80cd5 (patch) | |
tree | 526610397dfb83d72c43c94300deea23d26e782a /arch/sh/mm/Kconfig | |
parent | Merge branches 'sh/g3-prep' and 'sh/stable-updates' (diff) | |
parent | binfmt_elf_fdpic: Fix build breakage introduced by coredump changes. (diff) | |
download | linux-921a220857cdd3c553cde7c114f9f6757ac80cd5.tar.xz linux-921a220857cdd3c553cde7c114f9f6757ac80cd5.zip |
Merge branch 'sh/stable-updates'
Diffstat (limited to 'arch/sh/mm/Kconfig')
-rw-r--r-- | arch/sh/mm/Kconfig | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig index b3f6c1a30b22..a5dedf590a78 100644 --- a/arch/sh/mm/Kconfig +++ b/arch/sh/mm/Kconfig @@ -82,8 +82,7 @@ config 32BIT config PMB_ENABLE bool "Support 32-bit physical addressing through PMB" - depends on MMU && EXPERIMENTAL && CPU_SH4A - default y + depends on MMU && EXPERIMENTAL && CPU_SH4A && !CPU_SH4AL_DSP help If you say Y here, physical addressing will be extended to 32-bits through the SH-4A PMB. If this is not set, legacy @@ -96,7 +95,7 @@ choice config PMB bool "PMB" - depends on MMU && EXPERIMENTAL && CPU_SH4A + depends on MMU && EXPERIMENTAL && CPU_SH4A && !CPU_SH4AL_DSP help If you say Y here, physical addressing will be extended to 32-bits through the SH-4A PMB. If this is not set, legacy @@ -104,7 +103,7 @@ config PMB config PMB_FIXED bool "fixed PMB" - depends on MMU && EXPERIMENTAL && CPU_SH4A + depends on MMU && EXPERIMENTAL && CPU_SH4A && !CPU_SH4AL_DSP select 32BIT help If this option is enabled, fixed PMB mappings are inherited |