summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorOleg Drokin <green@linuxhacker.ru>2011-08-09 03:10:22 -0700
committerTony Lindgren <tony@atomide.com>2011-08-10 03:41:05 -0700
commit1d08fd9f6a7f2541a7b28a21fc638c4640d9cabb (patch)
treec6ad428f988a7f3e0a5693df1c21d9975ecd081f /arch/arm
parent5686c4f8250448cdbb15226aa32793df055123c5 (diff)
downloadlinux-1d08fd9f6a7f2541a7b28a21fc638c4640d9cabb.tar.bz2
Update Nook Color machine 3284 to common Encore name
Machine database already updated: http://www.arm.linux.org.uk/developer/machines/list.php?id=3284 Signed-off-by: Oleg Drokin <green@linuxhacker.ru> Acked-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/tools/mach-types2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types
index 3b3776d0a1a7..fff68d0d521b 100644
--- a/arch/arm/tools/mach-types
+++ b/arch/arm/tools/mach-types
@@ -910,7 +910,7 @@ omapl138_case_a3 MACH_OMAPL138_CASE_A3 OMAPL138_CASE_A3 3280
uemd MACH_UEMD UEMD 3281
ccwmx51mut MACH_CCWMX51MUT CCWMX51MUT 3282
rockhopper MACH_ROCKHOPPER ROCKHOPPER 3283
-nookcolor MACH_NOOKCOLOR NOOKCOLOR 3284
+encore MACH_ENCORE ENCORE 3284
hkdkc100 MACH_HKDKC100 HKDKC100 3285
ts42xx MACH_TS42XX TS42XX 3286
aebl MACH_AEBL AEBL 3287