aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authormerge <null@invalid>2009-03-02 16:23:51 +0000
committerAndy Green <agreen@octopus.localdomain>2009-03-02 16:23:51 +0000
commit560b9fed82e9fd5259ba611c9c6da449cf3f548b (patch)
tree350e238ccb764850475f51c0387fadf307eb0c3e /arch
parent4aaa04d0ad662362243e7acca6f8d91b0ff7517c (diff)
MERGE-via-pending-tracking-hist-add-om_3d7k_machine-type-patch
pending-tracking-hist top was add-om_3d7k_machine-type-patch / e4e3848be23080f6ca6727d2a4353f09e53b9781 ... parent commitmessage: From: Andy Green <andy@openmoko.com> add-om_3d7k_machine-type.patch Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/tools/mach-types2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types
index fd23c0e9e69..7ff65710878 100644
--- a/arch/arm/tools/mach-types
+++ b/arch/arm/tools/mach-types
@@ -1994,3 +1994,5 @@ benzina MACH_BENZINA BENZINA 2003
blaze MACH_BLAZE BLAZE 2004
linkstation_ls_hgl MACH_LINKSTATION_LS_HGL LINKSTATION_LS_HGL 2005
htcvenus MACH_HTCVENUS HTCVENUS 2006
+om_3d7k MACH_OM_3D7K OM_3D7K 2120
+