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

Skip to content
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
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment