fix the previous commit properly

Conflicts:
	arch/arm/include/asm/localtimer.h