From fcf8fd8caf913a0423f329dd0bffb59755e1f20c Mon Sep 17 00:00:00 2001 From: Brian Norris Date: Sun, 12 Dec 2010 00:23:32 -0800 Subject: [PATCH] --- yaml --- r: 231701 b: refs/heads/master c: 0b524fb9314dc852d6a029296545ddbb17709a8b h: refs/heads/master i: 231699: 1f5abfc584f1cc299fc0a53adfee7173bfbb4fdb v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/nand_base.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3f5c1d7a507d..a21e97e897f4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7e95d1f1714cb993bc5b7e3a3d532b715b32d80a +refs/heads/master: 0b524fb9314dc852d6a029296545ddbb17709a8b diff --git a/trunk/drivers/mtd/nand/nand_base.c b/trunk/drivers/mtd/nand/nand_base.c index 9c8da741dce0..c52ded31a12e 100644 --- a/trunk/drivers/mtd/nand/nand_base.c +++ b/trunk/drivers/mtd/nand/nand_base.c @@ -3157,7 +3157,7 @@ static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd, printk(KERN_INFO "NAND device: Manufacturer ID:" " 0x%02x, Chip ID: 0x%02x (%s %s)\n", *maf_id, *dev_id, nand_manuf_ids[maf_idx].name, - chip->onfi_version ? type->name : chip->onfi_params.model); + chip->onfi_version ? chip->onfi_params.model : type->name); return type; }