Merge branch 'kconfig-for-40' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek...

[pandora-kernel.git] / arch / arm / plat-nomadik / Kconfig

diff --git a/arch/arm/plat-nomadik/Kconfig b/arch/arm/plat-nomadik/Kconfig
index ad25c96..18296ee 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
@@ -25,10 +26,4 @@ config NOMADIK_GPIO
        help
          Support for the Nomadik GPIO controller.
 
-config NOMADIK_GPIO_PM
-       bool
-       depends on NOMADIK_GPIO && PM
-       help
-         Support PM for the Nomadik GPIO controller.
-
 endif