summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-10-12 20:49:27 +0200
committerWolfgang Denk <wd@denx.de>2010-10-12 20:49:27 +0200
commitc0c3590bb2646ad34527fa61bf19a1172e05fc4c (patch)
tree8459768c0342eece11a7d583c94e503bee148115 /drivers
parent655c54975296002587c705e05c23754edb121c2c (diff)
parent0e3fa01a636dcc015271329316a8b3b0bf66be2d (diff)
downloadtalos-obmc-uboot-c0c3590bb2646ad34527fa61bf19a1172e05fc4c.tar.gz
talos-obmc-uboot-c0c3590bb2646ad34527fa61bf19a1172e05fc4c.zip
Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mtd/cfi_flash.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index 02dd27ffb1..798902f337 100644
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -2033,7 +2033,7 @@ unsigned long flash_init (void)
printf ("## Unknown FLASH on Bank %d "
"- Size = 0x%08lx = %ld MB\n",
i+1, flash_info[i].size,
- flash_info[i].size << 20);
+ flash_info[i].size >> 20);
#endif /* CONFIG_SYS_FLASH_QUIET_TEST */
}
#ifdef CONFIG_SYS_FLASH_PROTECTION
OpenPOWER on IntegriCloud