diff options
author | Wolfgang Denk <wd@denx.de> | 2008-08-13 23:23:13 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2008-08-13 23:23:13 +0200 |
commit | 2fd0aad443c966ce62008225e57b18e2dcf4e330 (patch) | |
tree | a9166e535df4d867ce73eca3fd97ebc500ecf771 /drivers/mtd/nand/fsl_upm.c | |
parent | 5a7ddf4e1fb9347f783eb1473c30187d7a22bd81 (diff) | |
parent | 9483df6408c25f16060432de3868901e352e23bc (diff) | |
download | u-boot-imx-2fd0aad443c966ce62008225e57b18e2dcf4e330.zip u-boot-imx-2fd0aad443c966ce62008225e57b18e2dcf4e330.tar.gz u-boot-imx-2fd0aad443c966ce62008225e57b18e2dcf4e330.tar.bz2 |
Merge branch 'Makefile' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'drivers/mtd/nand/fsl_upm.c')
-rw-r--r-- | drivers/mtd/nand/fsl_upm.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/mtd/nand/fsl_upm.c b/drivers/mtd/nand/fsl_upm.c index e651903..1a1d8c4 100644 --- a/drivers/mtd/nand/fsl_upm.c +++ b/drivers/mtd/nand/fsl_upm.c @@ -11,8 +11,6 @@ */ #include <config.h> - -#if defined(CONFIG_CMD_NAND) && defined(CONFIG_NAND_FSL_UPM) #include <common.h> #include <asm/io.h> #include <asm/errno.h> @@ -150,4 +148,3 @@ int fsl_upm_nand_init(struct nand_chip *chip, struct fsl_upm_nand *fun) return 0; } -#endif /* CONFIG_CMD_NAND */ |