diff options
| author | Lei Wen <leiwen@marvell.com> | 2011-01-06 09:48:18 +0800 | 
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2011-01-12 17:13:10 -0600 | 
| commit | 245eb90091f30604211ac77d93aa131b5b950a50 (patch) | |
| tree | 0fdfe8e0b514ab3c8c1c010ba6f822e569b17697 /include/linux/mtd/nand.h | |
| parent | 47fc18f1e72ef1fc68a179c2b674a4c58646afc9 (diff) | |
| download | olio-uboot-2014.01-245eb90091f30604211ac77d93aa131b5b950a50.tar.xz olio-uboot-2014.01-245eb90091f30604211ac77d93aa131b5b950a50.zip | |
mtd: nand: Allow caller to pass alternative ID table to nand_scan_ident()
This patch sync with David's patch on Linux for handling nand_scan_ident.
	commit 5e81e88a4c140586d9212999cea683bcd66a15c6
	Author: David Woodhouse <David.Woodhouse@intel.com>
	Date:   Fri Feb 26 18:32:56 2010 +0000
	mtd: nand: Allow caller to pass alternative ID table to nand_scan_ident()
	Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: Lei Wen <leiwen@marvell.com>
Diffstat (limited to 'include/linux/mtd/nand.h')
| -rw-r--r-- | include/linux/mtd/nand.h | 4 | 
1 files changed, 3 insertions, 1 deletions
| diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index 1128f5ae1..d299929ab 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h @@ -33,11 +33,13 @@  struct mtd_info; +struct nand_flash_dev;  /* Scan and identify a NAND device */  extern int nand_scan (struct mtd_info *mtd, int max_chips);  /* Separate phases of nand_scan(), allowing board driver to intervene   * and override command or ECC setup according to flash type */ -extern int nand_scan_ident(struct mtd_info *mtd, int max_chips); +extern int nand_scan_ident(struct mtd_info *mtd, int max_chips, +			   const struct nand_flash_dev *table);  extern int nand_scan_tail(struct mtd_info *mtd);  /* Free resources held by the NAND device */ |