ARM: zynq: Don't select CONFIG_ICST

CONFIG_ICST is for ARM Ltd reference platforms and isn't used by Zynq
platform, so remove selecting it. It appears to be a copy-n-paste error.

Cc: Michal Simek <[email protected]>
Signed-off-by: Rob Herring <[email protected]>
[arnd: remove the versatile clk driver change I added previously]
Signed-off-by: Arnd Bergmann <[email protected]>

diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig
index 1ca633e3d024d8e6c2ee8eb7572b7088f502a282..43fb941dcd07366371f715f8cbaa6b02ab71b621 100644 (file)
--- a/arch/arm/mach-zynq/Kconfig
+++ b/arch/arm/mach-zynq/Kconfig
@@ -10,7 +10,6 @@ config ARCH_ZYNQ
        select CADENCE_TTC_TIMER
        select HAVE_ARM_SCU if SMP
        select HAVE_ARM_TWD if SMP
-       select ICST
        select MFD_SYSCON
        select PINCTRL
        select PINCTRL_ZYNQ

diff --git a/drivers/clk/versatile/Kconfig b/drivers/clk/versatile/Kconfig
index 84a2596e97215568e100a7f91db5a8c40c90ff89..8c1b0e8e8d329542b1284278eac75b5c0758ec1c 100644 (file)
--- a/drivers/clk/versatile/Kconfig
+++ b/drivers/clk/versatile/Kconfig
@@ -2,7 +2,7 @@
 
 menu "Clock driver for ARM Reference designs"
        depends on ARCH_INTEGRATOR || ARCH_REALVIEW || \
-               ARCH_VERSATILE || ARCH_VEXPRESS || ARCH_ZYNQ || COMPILE_TEST
+               ARCH_VERSATILE || ARCH_VEXPRESS || COMPILE_TEST
 
 config ICST
        bool "Clock driver for ARM Reference designs ICST"