defconfig: Fix from merge

Conflicts:
	arch/arm/configs/elite_defconfig