Merge commit 'ccbf62d8a284cf181ac28c8e8407dd077d90dd4b' into for-next

[cascardo/linux.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 290f02e..5f38033 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -65,7 +65,6 @@ config ARM
        select HAVE_UID16
        select HAVE_VIRT_CPU_ACCOUNTING_GEN
        select IRQ_FORCED_THREADING
-       select KTIME_SCALAR
        select MODULES_USE_ELF_REL
        select NO_BOOTMEM
        select OLD_SIGACTION
@@ -635,6 +634,7 @@ config ARCH_PXA
        select AUTO_ZRELADDR
        select CLKDEV_LOOKUP
        select CLKSRC_MMIO
+       select CLKSRC_OF
        select GENERIC_CLOCKEVENTS
        select GPIO_PXA
        select HAVE_IDE