Merge branch 'uaccess' (batched user access infrastructure)

[deliverable/linux.git] / arch / arm / mach-davinci / Kconfig

diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig
index dd8f5312b2c0e5d15e38b42dbaaee88a4718ce61..bcaf1d0255057ed02353b21028064001e0a1c2ef 100644 (file)
--- 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