Merge tag 'v3.10' into master-next

[vajnamar/linux-xlnx.git] / arch / arm / mach-zynq / Kconfig

diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig
index 60f09440dd0bdf4698edf4c1d3382341be661591..1e96e981a0e84947ac3e2db77e52ff35406c288c 100644 (file)
--- a/arch/arm/mach-zynq/Kconfig
+++ b/arch/arm/mach-zynq/Kconfig
@@ -5,11 +5,13 @@ config ARCH_ZYNQ
        select COMMON_CLK
        select CPU_V7
        select GENERIC_CLOCKEVENTS
+       select HAVE_ARM_SCU if SMP
+       select HAVE_ARM_TWD if LOCAL_TIMERS
        select ICST
        select MIGHT_HAVE_CACHE_L2X0
        select USE_OF
-       select SPARSE_IRQ
        select HAVE_SMP
+       select SPARSE_IRQ
        select CACHE_L2X0
        select ARCH_REQUIRE_GPIOLIB
        select COMMON_CLK