diff --git a/[refs] b/[refs]
index 47b05760d1be..18f49fd0cd07 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8f6faebaf5b3f0f56b7c12a4f99d97c56938b37
+refs/heads/master: fd87e081723089cba99df0b3d6f36ae2235c700a
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
index e02b893fb909..9909a93ec7fd 100644
--- a/trunk/arch/arm/Kconfig
+++ b/trunk/arch/arm/Kconfig
@@ -486,8 +486,6 @@ config ARCH_PXA
 	select HAVE_CLK
 	select COMMON_CLKDEV
 	select ARCH_REQUIRE_GPIOLIB
-	select HAVE_CLK
-	select COMMON_CLKDEV
 	select GENERIC_TIME
 	select GENERIC_CLOCKEVENTS
 	select TICK_ONESHOT