summaryrefslogtreecommitdiffstats
path: root/arch/arm/tools
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/tools
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/tools')
-rw-r--r--arch/arm/tools/mach-types4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types
index ccbe16f..9e66ebc 100644
--- a/arch/arm/tools/mach-types
+++ b/arch/arm/tools/mach-types
@@ -269,7 +269,7 @@ dns323 MACH_DNS323 DNS323 1542
omap3_beagle MACH_OMAP3_BEAGLE OMAP3_BEAGLE 1546
nokia_n810 MACH_NOKIA_N810 NOKIA_N810 1548
pcm038 MACH_PCM038 PCM038 1551
-ts_x09 MACH_TS209 TS209 1565
+ts209 MACH_TS209 TS209 1565
at91cap9adk MACH_AT91CAP9ADK AT91CAP9ADK 1566
mx31moboard MACH_MX31MOBOARD MX31MOBOARD 1574
vision_ep9307 MACH_VISION_EP9307 VISION_EP9307 1578
@@ -459,7 +459,7 @@ guruplug MACH_GURUPLUG GURUPLUG 2659
spear310 MACH_SPEAR310 SPEAR310 2660
spear320 MACH_SPEAR320 SPEAR320 2661
aquila MACH_AQUILA AQUILA 2676
-sheeva_esata MACH_ESATA_SHEEVAPLUG ESATA_SHEEVAPLUG 2678
+esata_sheevaplug MACH_ESATA_SHEEVAPLUG ESATA_SHEEVAPLUG 2678
msm7x30_surf MACH_MSM7X30_SURF MSM7X30_SURF 2679
ea2478devkit MACH_EA2478DEVKIT EA2478DEVKIT 2683
terastation_wxl MACH_TERASTATION_WXL TERASTATION_WXL 2697
OpenPOWER on IntegriCloud