Revert "fix compile errors"

This reverts commit b02f849e733804af1afac16fdaec9e586bb48cbe.

Conflicts:
	arch/arm/configs/cyanogenmod_gio_defconfig