diff options
author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2008-05-24 12:56:53 +0200 |
---|---|---|
committer | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2008-05-24 12:56:53 +0200 |
commit | 42fd5f87b1613d3039f57e93c16f760a768d3e84 (patch) | |
tree | 9dd0252fca37dbdb1148ce7fd44dc5c9dd8a6b34 /common/env_nand.c | |
parent | 2c8d41969b47eb0b973912830c58689b2ba0e50a (diff) | |
parent | 54694a91428f6c3280fe1ee0923488a1e7e8dbc4 (diff) | |
download | u-boot-imx-42fd5f87b1613d3039f57e93c16f760a768d3e84.zip u-boot-imx-42fd5f87b1613d3039f57e93c16f760a768d3e84.tar.gz u-boot-imx-42fd5f87b1613d3039f57e93c16f760a768d3e84.tar.bz2 |
Merging Stelian Pop AT91 patches
Merge branch 'testing-V2'
Conflicts:
board/atmel/at91cap9adk/Makefile
Fixing copyright
board/atmel/at91sam9260ek/Makefile
Fixing copyright
board/atmel/at91sam9260ek/u-boot.lds
Delete no more needed ld script
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'common/env_nand.c')
-rw-r--r-- | common/env_nand.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/common/env_nand.c b/common/env_nand.c index 70d05ad..3a98d2b 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; |