---

yaml --- r: 231701 b: refs/heads/master c: 0b524fb h: refs/heads/master i: 231699: 1f5abfc v: v3
git-mirror · Jan 6, 2011 · fcf8fd8 · fcf8fd8
1 parent 738db80
commit fcf8fd8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;
 }