summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-orion5x/ts209-setup.c
diff options
context:
space:
mode:
authorJon Medhurst (Tixy) <tixy@yxit.co.uk>2011-12-06 09:59:38 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-12-06 11:14:01 +0000
commitd22759ed5680055fdecbdcf6644dbc8a467ab801 (patch)
treeaaf9503947a5757bfe8ddd0f161e16c67a4face0 /arch/arm/mach-orion5x/ts209-setup.c
parent023bfa3dc7ec8316a499d247c2734a54a9763708 (diff)
downloadop-kernel-dev-d22759ed5680055fdecbdcf6644dbc8a467ab801.zip
op-kernel-dev-d22759ed5680055fdecbdcf6644dbc8a467ab801.tar.gz
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>
Diffstat (limited to 'arch/arm/mach-orion5x/ts209-setup.c')
-rw-r--r--arch/arm/mach-orion5x/ts209-setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-orion5x/ts209-setup.c b/arch/arm/mach-orion5x/ts209-setup.c
index 31e51f9..fbf66ea 100644
--- a/arch/arm/mach-orion5x/ts209-setup.c
+++ b/arch/arm/mach-orion5x/ts209-setup.c
@@ -178,7 +178,7 @@ static struct hw_pci qnap_ts209_pci __initdata = {
static int __init qnap_ts209_pci_init(void)
{
- if (machine_is_ts_x09())
+ if (machine_is_ts209())
pci_common_init(&qnap_ts209_pci);
return 0;
OpenPOWER on IntegriCloud