projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' of git://git.denx.de/u-boot-avr32
[platform/kernel/u-boot.git]
/
drivers
/
mtd
/
nand
/
fsl_upm.c
diff --git
a/drivers/mtd/nand/fsl_upm.c
b/drivers/mtd/nand/fsl_upm.c
index
e651903
..
1a1d8c4
100644
(file)
--- 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 */