fix build errors with gcc 4.8

Conflicts:
	arch/arm/configs/ville_defconfig