Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / arch / arm / mach-bcm / Kconfig

diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
index 48705c10a0feb970fa89c61e30126122e21b33f1..f11289519c399c09c8e9725c78f5097a00644319 100644 (file)
--- a/arch/arm/mach-bcm/Kconfig
+++ b/arch/arm/mach-bcm/Kconfig
@@ -6,8 +6,8 @@ config ARCH_BCM
        select ARM_ERRATA_764369 if SMP
        select ARM_GIC
        select CPU_V7
+       select CLKSRC_OF
        select GENERIC_CLOCKEVENTS
-       select GENERIC_GPIO
        select GENERIC_TIME
        select GPIO_BCM
        select SPARSE_IRQ