Merge with mainline to remove plat-omap/Kconfig conflict

[karo-tx-linux.git] / arch / arm / plat-omap / Kconfig

diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index be9484a28b124a0f1eb7f897b7334ccf57c882d8..6da796ef82bd12df19c913a78ff3c4f012cccb2b 100644 (file)
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -31,6 +31,7 @@ config ARCH_OMAP3
        depends on ARCH_OMAP2PLUS
        select CPU_V7
        select USB_ARCH_HAS_EHCI
+       select ARM_L1_CACHE_SHIFT_6
 
 config ARCH_OMAP4
        bool "TI OMAP4"