diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2014-02-24 10:06:56 +0100 |
|---|---|---|
| committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2014-02-24 10:06:56 +0100 |
| commit | 51bcb6aae8471ae60f59a64a8b6891f3ea591c74 (patch) | |
| tree | d0d991877bfac6f9c347fce7c73a6027dfb49224 /arch/arm/mach-efm32 | |
| parent | a00dfeddf4f81335afa6174f0e5a7ebd611b8c4c (diff) | |
| parent | fb3174e4ad2427c6ad90c67093d6ca97f13e8672 (diff) | |
Merge tag 'dropmachtimexh-v2' of git://git.pengutronix.de/git/ukl/linux
This cleanup series gets rid of <mach/timex.h> for platforms not using
ARCH_MULTIPLATFORM. (For multi-platform code it's already unused since
387798b (ARM: initial multiplatform support).)
To make this work some code out of arch/arm needed to be adapted. The
respective changes got acks by their maintainers to be taken via armsoc
(with Andrew Morton substituting for Alessandro Zummo as rtc maintainer).
Compared to the previous pull request there was another patch added that
fixes a (non-critical) regression on ixp4xx. Olof Johansson asked to not
squash this fix into the original commit to save him from the need to
reverify the series.
Conflicts:
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-at91/at91sam9261.c
arch/arm/mach-at91/at91sam9263.c
arch/arm/mach-at91/at91sam9rl.c
arch/arm/mach-mmp/time.c
arch/arm/mach-sa1100/time.c
Diffstat (limited to 'arch/arm/mach-efm32')
0 files changed, 0 insertions, 0 deletions