From 1b46f3a06ff49f63740cfb70afe41972fd78b372 Mon Sep 17 00:00:00 2001 From: Marc Zyngier Date: Thu, 18 Feb 2010 20:30:31 +0000 Subject: [PATCH] --- yaml --- r: 187480 b: refs/heads/master c: 90ac0dfd9f5931c9011b35ced0ba576e32656fb2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-pxa/zeus.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 745331afd701..4a7bf309f0df 100644 --- 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 index 1a73dc8f4e41..82070e376617 100644 --- 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 */ .phys_io = 0x40000000, .io_pg_offst = ((io_p2v(0x40000000) >> 18) & 0xfffc),