From a745ef68e433a6879ae80bc25ffc99b01c56e8b5 Mon Sep 17 00:00:00 2001 From: "Steven J. Hill" Date: Wed, 18 Jul 2007 23:29:46 -0500 Subject: [PATCH] --- yaml --- r: 68488 b: refs/heads/master c: 30eb0db07d67b9211da7f506220184df827e425d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/nand_ids.c | 1 + trunk/include/linux/mtd/nand.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 880c22721040..2fbcf70c10c3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 39fe5434cb9de5da40510028b17b96bc4eb312b3 +refs/heads/master: 30eb0db07d67b9211da7f506220184df827e425d diff --git a/trunk/drivers/mtd/nand/nand_ids.c b/trunk/drivers/mtd/nand/nand_ids.c index 2fc674a190cf..a3e3ab0185d5 100644 --- a/trunk/drivers/mtd/nand/nand_ids.c +++ b/trunk/drivers/mtd/nand/nand_ids.c @@ -141,6 +141,7 @@ struct nand_manufacturers nand_manuf_ids[] = { {NAND_MFR_STMICRO, "ST Micro"}, {NAND_MFR_HYNIX, "Hynix"}, {NAND_MFR_MICRON, "Micron"}, + {NAND_MFR_AMD, "AMD"}, {0x0, "Unknown"} }; diff --git a/trunk/include/linux/mtd/nand.h b/trunk/include/linux/mtd/nand.h index d2365c8dcacc..c42bc7f533a5 100644 --- a/trunk/include/linux/mtd/nand.h +++ b/trunk/include/linux/mtd/nand.h @@ -432,6 +432,7 @@ struct nand_chip { #define NAND_MFR_STMICRO 0x20 #define NAND_MFR_HYNIX 0xad #define NAND_MFR_MICRON 0x2c +#define NAND_MFR_AMD 0x01 /** * struct nand_flash_dev - NAND Flash Device ID Structure