fix for 4.6+ compilers

Conflicts:
	arch/arm/mm/Makefile