Fixed compile errors (with Linaro GCC 4.8 as well)

Conflicts:

	Makefile
	arch/arm/configs/sultan_defconfig
	block/Kconfig.iosched

Signed-off-by: Phil <phil@phil-desktop.(none)>