diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-01-04 02:45:56 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-01-04 02:45:56 -0500 |
| commit | 921a220857cdd3c553cde7c114f9f6757ac80cd5 (patch) | |
| tree | 526610397dfb83d72c43c94300deea23d26e782a /arch/sh/mm/Kconfig | |
| parent | 17eb9d62828c3688f41f31ac00d7fee6da9675bf (diff) | |
| parent | 2f48912d1443a796f10c42c89cb386f0e3eca04d (diff) | |
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 | |||
| 82 | 82 | ||
| 83 | config PMB_ENABLE | 83 | config PMB_ENABLE |
| 84 | bool "Support 32-bit physical addressing through PMB" | 84 | bool "Support 32-bit physical addressing through PMB" |
| 85 | depends on MMU && EXPERIMENTAL && CPU_SH4A | 85 | depends on MMU && EXPERIMENTAL && CPU_SH4A && !CPU_SH4AL_DSP |
| 86 | default y | ||
| 87 | help | 86 | help |
| 88 | If you say Y here, physical addressing will be extended to | 87 | If you say Y here, physical addressing will be extended to |
| 89 | 32-bits through the SH-4A PMB. If this is not set, legacy | 88 | 32-bits through the SH-4A PMB. If this is not set, legacy |
| @@ -96,7 +95,7 @@ choice | |||
| 96 | 95 | ||
| 97 | config PMB | 96 | config PMB |
| 98 | bool "PMB" | 97 | bool "PMB" |
| 99 | depends on MMU && EXPERIMENTAL && CPU_SH4A | 98 | depends on MMU && EXPERIMENTAL && CPU_SH4A && !CPU_SH4AL_DSP |
| 100 | help | 99 | help |
| 101 | If you say Y here, physical addressing will be extended to | 100 | If you say Y here, physical addressing will be extended to |
| 102 | 32-bits through the SH-4A PMB. If this is not set, legacy | 101 | 32-bits through the SH-4A PMB. If this is not set, legacy |
| @@ -104,7 +103,7 @@ config PMB | |||
| 104 | 103 | ||
| 105 | config PMB_FIXED | 104 | config PMB_FIXED |
| 106 | bool "fixed PMB" | 105 | bool "fixed PMB" |
| 107 | depends on MMU && EXPERIMENTAL && CPU_SH4A | 106 | depends on MMU && EXPERIMENTAL && CPU_SH4A && !CPU_SH4AL_DSP |
| 108 | select 32BIT | 107 | select 32BIT |
| 109 | help | 108 | help |
| 110 | If this option is enabled, fixed PMB mappings are inherited | 109 | If this option is enabled, fixed PMB mappings are inherited |