ARM: 7193/1: Fix machine_is_xxx() naming for eSata SheevaPlug and QNAP TS-209
authorJon Medhurst (Tixy) <tixy@yxit.co.uk>
Tue, 6 Dec 2011 08:59:38 +0000 (09:59 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 6 Dec 2011 11:14:01 +0000 (11:14 +0000)
commitd22759ed5680055fdecbdcf6644dbc8a467ab801
treeaaf9503947a5757bfe8ddd0f161e16c67a4face0
parent023bfa3dc7ec8316a499d247c2734a54a9763708
ARM: 7193/1: Fix machine_is_xxx() naming for eSata SheevaPlug and QNAP TS-209

The eSata SheevaPlug and QNAP TS-209 devices were removed from
mach-types due to naming mismatches between machine_is_xxx(), CONFIG_XXX
and MACH_TYPE_XXX.

This patch fixes those mismatches and adds the devices back into
mach-types.

Acked-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/mach-kirkwood/sheevaplug-setup.c
arch/arm/mach-orion5x/ts209-setup.c
arch/arm/tools/mach-types