---

yaml --- r: 187480 b: refs/heads/master c: 90ac0df h: refs/heads/master v: v3
git-mirror · Mar 1, 2010 · 1b46f3a · 1b46f3a
1 parent 8325eff
commit 1b46f3a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ff27dfa6e484ff5d901ec075a623c06c46d7a0f
+refs/heads/master: 90ac0dfd9f5931c9011b35ced0ba576e32656fb2
diff --git a/trunk/arch/arm/mach-pxa/zeus.c b/trunk/arch/arm/mach-pxa/zeus.c
@@ -849,7 +849,7 @@ static void __init zeus_map_io(void)
 	PCFR = PCFR_OPDE | PCFR_DC_EN | PCFR_FS | PCFR_FP;
 }
 
-MACHINE_START(ARCOM_ZEUS, "Arcom ZEUS")
+MACHINE_START(ARCOM_ZEUS, "Arcom/Eurotech ZEUS")
 	/* Maintainer: Marc Zyngier <maz@misterjones.org> */
 	.phys_io	= 0x40000000,
 	.io_pg_offst	= ((io_p2v(0x40000000) >> 18) & 0xfffc),