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 'Makefile' of git://git.denx.de/u-boot-arm
[platform/kernel/u-boot.git]
/
drivers
/
mtd
/
nand
/
nand_bbt.c
diff --git
a/drivers/mtd/nand/nand_bbt.c
b/drivers/mtd/nand/nand_bbt.c
index
8447947
..
b3b740d
100644
(file)
--- a/
drivers/mtd/nand/nand_bbt.c
+++ b/
drivers/mtd/nand/nand_bbt.c
@@
-53,9
+53,6
@@
*/
#include <common.h>
-
-#if defined(CONFIG_CMD_NAND) && !defined(CFG_NAND_LEGACY)
-
#include <malloc.h>
#include <linux/mtd/compat.h>
#include <linux/mtd/mtd.h>
@@
-1237,5
+1234,3
@@
int nand_isbad_bbt(struct mtd_info *mtd, loff_t offs, int allowbbt)
EXPORT_SYMBOL(nand_scan_bbt);
EXPORT_SYMBOL(nand_default_bbt);
#endif
-
-#endif