• Uwe Kleine-König's avatar
    Merge tag 'dropmachtimexh-v2' of git://git.pengutronix.de/git/ukl/linux · 51bcb6aa
    Uwe Kleine-König authored
    This cleanup series gets rid of <mach/timex.h> for platforms not using
    ARCH_MULTIPLATFORM. (For multi-platform code it's already unused since
    387798b3 (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
    51bcb6aa
pm.c 8.36 KB