Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus

[karo-tx-linux.git] / arch / arm / plat-nomadik / Kconfig

diff --git a/arch/arm/plat-nomadik/Kconfig b/arch/arm/plat-nomadik/Kconfig
index 187f4e84bb220fd8f9a804251e33688c9ae5917c..ce659015535e4a86bc6e708fa3abcc2e59742ec0 100644 (file)
--- a/arch/arm/plat-nomadik/Kconfig
+++ b/arch/arm/plat-nomadik/Kconfig
@@ -5,6 +5,7 @@
 config PLAT_NOMADIK
        bool
        depends on ARCH_NOMADIK || ARCH_U8500
+       select CLKSRC_MMIO
        default y
        help
          Common platform code for Nomadik and other ST-Ericsson
@@ -20,9 +21,4 @@ config HAS_MTU
          to multiple interrupt generating programmable
          32-bit free running decrementing counters.
 
-config NOMADIK_GPIO
-       bool
-       help
-         Support for the Nomadik GPIO controller.
-
 endif