diff options
author | Wolfgang Denk <wd@denx.de> | 2009-01-23 22:48:06 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2009-01-23 22:48:06 +0100 |
commit | 5df70e91c72dab45b7d81e4568b12e5a5b5f90ec (patch) | |
tree | 730f833cff2474959195b5cd23e52954410218a5 /include/linux/mtd/nand.h | |
parent | 1ca1d3c866709635fc082b0140e02257a742316c (diff) | |
parent | d4bade8d77aa20e2846fa4accff0e7fa7961a134 (diff) | |
download | u-boot-imx-5df70e91c72dab45b7d81e4568b12e5a5b5f90ec.zip u-boot-imx-5df70e91c72dab45b7d81e4568b12e5a5b5f90ec.tar.gz u-boot-imx-5df70e91c72dab45b7d81e4568b12e5a5b5f90ec.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
Diffstat (limited to 'include/linux/mtd/nand.h')
-rw-r--r-- | include/linux/mtd/nand.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index 24ad2bd..a4ad571 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h @@ -46,11 +46,6 @@ extern void nand_release (struct mtd_info *mtd); /* Internal helper for board drivers which need to override command function */ extern void nand_wait_ready(struct mtd_info *mtd); -/* The maximum number of NAND chips in an array */ -#ifndef NAND_MAX_CHIPS -#define NAND_MAX_CHIPS 8 -#endif - /* This constant declares the max. oobsize / page, which * is supported now. If you add a chip with bigger oobsize/page * adjust this accordingly. @@ -477,10 +472,6 @@ struct nand_manufacturers { extern struct nand_flash_dev nand_flash_ids[]; extern struct nand_manufacturers nand_manuf_ids[]; -#ifndef NAND_MAX_CHIPS -#define NAND_MAX_CHIPS 8 -#endif - extern int nand_scan_bbt(struct mtd_info *mtd, struct nand_bbt_descr *bd); extern int nand_update_bbt(struct mtd_info *mtd, loff_t offs); extern int nand_default_bbt(struct mtd_info *mtd); |