summaryrefslogtreecommitdiffstats
path: root/arch/arm/cpu/armv7
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-04-13 09:39:29 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-04-13 09:39:29 +0200
commit0c669fd17a9d8452f70369474925a91139e3005d (patch)
tree13cf4ed24376688f72205f1d299ddf1398a7dbbd /arch/arm/cpu/armv7
parent5e7ffaa4a31df369adeb9387b22a1981e93ea6b1 (diff)
parent46afd3eff3e53e29613c489af0c128203bb3c5b4 (diff)
downloadblackbird-obmc-uboot-0c669fd17a9d8452f70369474925a91139e3005d.tar.gz
blackbird-obmc-uboot-0c669fd17a9d8452f70369474925a91139e3005d.zip
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/cpu/armv7')
-rw-r--r--arch/arm/cpu/armv7/omap3/sys_info.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/cpu/armv7/omap3/sys_info.c b/arch/arm/cpu/armv7/omap3/sys_info.c
index 3c80113502..08a63d266e 100644
--- a/arch/arm/cpu/armv7/omap3/sys_info.c
+++ b/arch/arm/cpu/armv7/omap3/sys_info.c
@@ -299,9 +299,9 @@ int print_cpuinfo (void)
}
if ((get_cpu_rev() >= CPU_3XX_ES31) &&
(get_sku_id() == SKUID_CLK_720MHZ))
- max_clk = "720 mHz";
+ max_clk = "720 MHz";
else
- max_clk = "600 mHz";
+ max_clk = "600 MHz";
break;
case CPU_AM35XX:
OpenPOWER on IntegriCloud