summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa
diff options
context:
space:
mode:
authorMarc Zyngier <maz@misterjones.org>2010-02-18 20:30:31 +0000
committerEric Miao <eric.y.miao@gmail.com>2010-03-02 07:40:59 +0800
commit90ac0dfd9f5931c9011b35ced0ba576e32656fb2 (patch)
tree40fa31b231b13b68cecf5adc94acfdf3a4aa02b7 /arch/arm/mach-pxa
parent7ff27dfa6e484ff5d901ec075a623c06c46d7a0f (diff)
downloadblackbird-op-linux-90ac0dfd9f5931c9011b35ced0ba576e32656fb2.tar.gz
blackbird-op-linux-90ac0dfd9f5931c9011b35ced0ba576e32656fb2.zip
[ARM] pxa/zeus: Add Eurotech as the manufacturer
Signed-off-by: Amit Walambe <amit.walambe@eurotech.com> Signed-off-by: Marc Zyngier <maz@misterjones.org> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch/arm/mach-pxa')
-rw-r--r--arch/arm/mach-pxa/zeus.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/zeus.c b/arch/arm/mach-pxa/zeus.c
index 1a73dc8f4e41..82070e376617 100644
--- a/arch/arm/mach-pxa/zeus.c
+++ b/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),
OpenPOWER on IntegriCloud