From 894789889f3c9e20030b83e987b32bb82c25f499 Mon Sep 17 00:00:00 2001 From: Matthieu CASTET Date: Thu, 22 Nov 2012 18:33:40 +0100 Subject: [PATCH] --- yaml --- r: 347211 b: refs/heads/master c: 2fd71a294a0aac407ec69e04916dc28eb39c8ac0 h: refs/heads/master i: 347209: a2207e2e9863c1616555c86569cad353b48976b3 347207: 43dd0188e7578f34806b9537c9938497197f88f2 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/nand_base.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0814379b3bd3..7cf9a7503b4a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ca6a24893073414c549920d93bac57d46d7f3e1e +refs/heads/master: 2fd71a294a0aac407ec69e04916dc28eb39c8ac0 diff --git a/trunk/drivers/mtd/nand/nand_base.c b/trunk/drivers/mtd/nand/nand_base.c index 7738432c62dd..6f58e1633e2f 100644 --- a/trunk/drivers/mtd/nand/nand_base.c +++ b/trunk/drivers/mtd/nand/nand_base.c @@ -3293,10 +3293,10 @@ static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd, chip->cmdfunc = nand_command_lp; pr_info("NAND device: Manufacturer ID: 0x%02x, Chip ID: 0x%02x (%s %s)," - " page size: %d, OOB size: %d\n", + " %dMiB, page size: %d, OOB size: %d\n", *maf_id, *dev_id, nand_manuf_ids[maf_idx].name, chip->onfi_version ? chip->onfi_params.model : type->name, - mtd->writesize, mtd->oobsize); + (int)(chip->chipsize >> 20), mtd->writesize, mtd->oobsize); return type; }