summaryrefslogtreecommitdiff
path: root/drivers/mtd/nand/nand_ids.c
diff options
context:
space:
mode:
authorScott Wood <scottwood@freescale.com>2008-10-24 16:20:43 -0500
committerScott Wood <scottwood@freescale.com>2008-10-29 10:42:16 -0500
commitc45912d8abc52de796b9059a58faf7c4166eab58 (patch)
treea1b020b0dd2c78af2663f79915d128f99145bc34 /drivers/mtd/nand/nand_ids.c
parentb1d0db1805c3395149777e507b6da53410abac4e (diff)
downloadu-boot-imx-c45912d8abc52de796b9059a58faf7c4166eab58.zip
u-boot-imx-c45912d8abc52de796b9059a58faf7c4166eab58.tar.gz
u-boot-imx-c45912d8abc52de796b9059a58faf7c4166eab58.tar.bz2
NAND: sync with 2.6.27
This brings the core NAND code up to date with the Linux kernel. Since there were several drivers in Linux as of the last update that are not in u-boot, I'm not bringing over new drivers that have been added since in the absence of an interested party. I did not update OneNAND since it was recently synced by Kyungmin Park, and I'm not sure exactly what the common ancestor is. Signed-off-by: Scott Wood <scottwood@freescale.com>
Diffstat (limited to 'drivers/mtd/nand/nand_ids.c')
-rw-r--r--drivers/mtd/nand/nand_ids.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mtd/nand/nand_ids.c b/drivers/mtd/nand/nand_ids.c
index 2ff75c9..077c305 100644
--- a/drivers/mtd/nand/nand_ids.c
+++ b/drivers/mtd/nand/nand_ids.c
@@ -3,8 +3,6 @@
*
* Copyright (C) 2002 Thomas Gleixner (tglx@linutronix.de)
*
- * $Id: nand_ids.c,v 1.16 2005/11/07 11:14:31 gleixner Exp $
- *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
@@ -142,5 +140,6 @@ 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"}
};