Rather than:

	config CPU_BLAH
		bool
		depends on ARCH_FOO || MACH_BAR
		default y if ARCH_FOO || MACH_BAR

arrange for ARCH_FOO and MACH_BAR to select CPU_BLAH directly.
Acked-by: NNicolas Pitre <nico@marvell.com>
Acked-by: NAndrew Victor <linux@maxim.org.za>
Acked-by: NBrian Swetland <swetland@google.com>
Acked-by: NEric Miao <eric.miao@marvell.com>
Acked-by: NNicolas Bellido <ml@acolin.be>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>