arm/kernel: fix merge error

Conflicts:
	arch/arm/kernel/setup.c

Change-Id: Ia75eaa1da6d65d700a806618d005ac4784e794ce