summaryrefslogtreecommitdiff
path: root/arch/arm/mach-davinci/Kconfig
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2015-12-22 11:40:17 -0800
committerOlof Johansson <olof@lixom.net>2015-12-22 11:40:17 -0800
commit4749edf82fac0a370fadb9ba9fdb14f5626056a7 (patch)
tree7ca7db2a6ec217bbbcedd1e3cca21aa5c5494898 /arch/arm/mach-davinci/Kconfig
parenta436848cc73ba584034b44d326df1ff697904331 (diff)
parent5bcd927233d18fbfabed461b31b0118147648525 (diff)
Merge tag 'davinci-for-v4.5/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/fixes-non-critical
This pull request includes a fix for improper usage of WARN() and a fix for unmet 'select' dependencies. * tag 'davinci-for-v4.5/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: ARM: davinci: fix a problematic usage of WARN() ARM: davinci: only select WT cache if cache is enabled Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-davinci/Kconfig')
-rw-r--r--arch/arm/mach-davinci/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig
index dd8f5312b2c0..bcaf1d025505 100644
--- a/arch/arm/mach-davinci/Kconfig
+++ b/arch/arm/mach-davinci/Kconfig
@@ -34,7 +34,8 @@ config ARCH_DAVINCI_DA830
bool "DA830/OMAP-L137/AM17x based system"
depends on !ARCH_DAVINCI_DMx || AUTO_ZRELADDR
select ARCH_DAVINCI_DA8XX
- select CPU_DCACHE_WRITETHROUGH # needed on silicon revs 1.0, 1.1
+ # needed on silicon revs 1.0, 1.1:
+ select CPU_DCACHE_WRITETHROUGH if !CPU_DCACHE_DISABLE
select CP_INTC
config ARCH_DAVINCI_DA850