diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-12-27 23:41:33 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-27 23:41:33 +0000 |
| commit | 4551ae0a24bba06972247a80f721fc21f6b2b758 (patch) | |
| tree | 7e17b819ba34f73988d384161335ebe5729897ad /arch/arm/Kconfig | |
| parent | e2c236f0a42fbb9e6a9528f8436f348218ffee96 (diff) | |
| parent | 384703b8e6cd4c8ef08512e596024e028c91c339 (diff) | |
Merge branch 'v3.2-rc6' into next/drivers
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 96804b5dd21b..b8c69726839c 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -220,8 +220,9 @@ config NEED_MACH_MEMORY_H be avoided when possible. config PHYS_OFFSET - hex "Physical address of main memory" + hex "Physical address of main memory" if MMU depends on !ARM_PATCH_PHYS_VIRT && !NEED_MACH_MEMORY_H + default DRAM_BASE if !MMU help Please provide the physical address corresponding to the location of main memory in your system. |