diff options
| author | Wolfgang Denk <[email protected]> | 2008-06-03 00:16:48 +0200 |
|---|---|---|
| committer | Wolfgang Denk <[email protected]> | 2008-06-03 00:16:48 +0200 |
| commit | 7feb4d38ff1fdf8877f39447001ff9f6e93fa6bc (patch) | |
| tree | 5ba2f3b891a37f5e9beef2710ef2f82bdbf5f0e4 /common | |
| parent | e3d0d4ac0ec900543bdda141f9ada9bf6c47d011 (diff) | |
| parent | d6ac2ed893c2168738aee01579d6283af8d37045 (diff) | |
Merge remote branch 'u-boot-nand-flash/master'
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_nand.c | 2 | ||||
| -rw-r--r-- | common/env_nand.c | 3 |
2 files changed, 0 insertions, 5 deletions
diff --git a/common/cmd_nand.c b/common/cmd_nand.c index 37eb41b20e6..37198d21e8c 100644 --- a/common/cmd_nand.c +++ b/common/cmd_nand.c @@ -37,8 +37,6 @@ int find_dev_and_part(const char *id, struct mtd_device **dev, u8 *part_num, struct part_info **part); #endif -extern nand_info_t nand_info[]; /* info for NAND chips */ - static int nand_dump_oob(nand_info_t *nand, ulong off) { return 0; diff --git a/common/env_nand.c b/common/env_nand.c index 70d05ad15a2..3a98d2b944b 100644 --- a/common/env_nand.c +++ b/common/env_nand.c @@ -57,9 +57,6 @@ int nand_legacy_rw (struct nand_chip* nand, int cmd, size_t start, size_t len, size_t * retlen, u_char * buf); -/* info for NAND chips, defined in drivers/mtd/nand/nand.c */ -extern nand_info_t nand_info[]; - /* references to names in env_common.c */ extern uchar default_environment[]; extern int default_environment_size; |