Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80528e19 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
parents dd67f8a0 d5d5ce95

arch/arm/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-efm32/include/mach/entry-macro.S

deleted100644 → 0
+0 −4
Original line number Diff line number Diff line 
/*

 * Empty file waiting for deletion once <mach/entry-macro.S> isn't needed any

 * more. Patch "ARM: v7-M: drop using mach/entry-macro.S" sitting in next.

 */

arch/arm/mach-efm32/include/mach/timex.h

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
/*

 * Empty file waiting for deletion once <mach/timex.h> isn't needed any more.

 */