diff --git a/[refs] b/[refs]
index 1a70429504b1..82b558daf0ea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4d9c377c81d37740b25cacf025f95c084eafabbb
+refs/heads/master: 93686ae8357c1b1e37e8dfc96547f807e7a93b4b
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
index c8f528284a94..ea5eb5f79adb 100644
--- a/trunk/arch/arm/Kconfig
+++ b/trunk/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.