diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2012-03-12 09:41:28 -0600 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2012-03-12 09:41:28 -0600 |
commit | e2aa4177264c1a459779d6e35fae22adf17a9232 (patch) | |
tree | beba4b40aa90f6f033eb261cf5a5453c5957c87c /arch/arm/mm/Kconfig | |
parent | 25db711df3258d125dc1209800317e5c0ef3c870 (diff) | |
parent | fde7d9049e55ab85a390be7f415d74c9f62dd0f9 (diff) |
Merge tag 'v3.3-rc7' into gpio/next
Linux 3.3-rc7. Merged into the gpio branch to pick up gpio bugfixes already
in mainline before queueing up move v3.4 patches
Diffstat (limited to 'arch/arm/mm/Kconfig')
-rw-r--r-- | arch/arm/mm/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index 1a3ca248816..7edef912163 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig @@ -631,7 +631,8 @@ comment "Processor Features" config ARM_LPAE bool "Support for the Large Physical Address Extension" - depends on MMU && CPU_V7 + depends on MMU && CPU_32v7 && !CPU_32v6 && !CPU_32v5 && \ + !CPU_32v4 && !CPU_32v3 help Say Y if you have an ARMv7 processor supporting the LPAE page table format and you would like to access memory beyond the |