From: Uwe Kleine-König Date: Thu, 20 Feb 2014 08:50:57 +0000 (+0100) Subject: ARM: efm32: drop selecting CLKSRC_MMIO X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a00dfeddf4f81335afa6174f0e5a7ebd611b8c4c;p=linux-beck.git ARM: efm32: drop selecting CLKSRC_MMIO CLKSRC_MMIO is needed on efm32 because the clocksource driver (CLKSRC_EFM32) uses clocksource_mmio_init() and clocksource_mmio_readl_up(). Since commit 09ca27579ee5 (clocksource: time-efm32: Select CLKSRC_MMIO) CLKSRC_EFM32 does the necessary select itself and ARCH_EFM32 doesn't need to select it explicitly any more. Signed-off-by: Uwe Kleine-König --- diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index e25419817791..fd4fecdb1b0b 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -421,9 +421,6 @@ config ARCH_EFM32 depends on !MMU select ARCH_REQUIRE_GPIOLIB select ARM_NVIC - # CLKSRC_MMIO is wrong here, but needed until a proper fix is merged, - # i.e. CLKSRC_EFM32 selecting CLKSRC_MMIO - select CLKSRC_MMIO select CLKSRC_OF select COMMON_CLK select CPU_V7M