Merge tag 'efm32-next' of git://git.pengutronix.de/git/ukl/linux into next/cleanup

Merge "efm32 cleanups for next" from Uwe Kleine-König

Just three simple cleanups for efm32 removing two now unused files and a
superflous select by ARCH_EFM32.

As these cleanups have dependencies on both v3.14-rc1 and my timex.h cleanup
(which is based on v3.13-rc1) this pull request also included a merge of my
cleanup tag which is already in armsoc/next/cleanup.

* tag 'efm32-next' of git://git.pengutronix.de/git/ukl/linux:
  ARM: efm32: drop unused file <mach/timex.h>
  ARM: efm32: drop selecting CLKSRC_MMIO
  ARM: efm32: drop unused file entry-macro.S

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

1 files changed, 0 insertions, 3 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index f093f2030c1c..224793cefa31 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