arm: fix HAVE_CLK merge goof

This fixes a merge goof whereby ARCH_EP93XX got the "select HAVE_CLK" line
which belongs instead with ARCH_AT91.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index c8f528284a94e3efa98dc5f3dcd4fa4ca11a8c3e..ea5eb5f79adb8b7abdfd0af1359e2b876ec68ea7 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -234,6 +234,7 @@ config ARCH_VERSATILE
 config ARCH_AT91
        bool "Atmel AT91"
        select GENERIC_GPIO
+       select HAVE_CLK
        help
          This enables support for systems based on the Atmel AT91RM9200,
          AT91SAM9 and AT91CAP9 processors.
@@ -267,7 +268,6 @@ config ARCH_EP93XX
        select ARM_VIC
        select GENERIC_GPIO
        select HAVE_CLK
-       select HAVE_CLK
        select ARCH_REQUIRE_GPIOLIB
        help
          This enables support for the Cirrus EP93xx series of CPUs.