projects
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Conditionally perform common relocation fixups
[kernel/u-boot.git]
/
drivers
/
mtd
/
nand
/
nand.c
diff --git
a/drivers/mtd/nand/nand.c
b/drivers/mtd/nand/nand.c
index
9065fa9
..
47d6872
100644
(file)
--- a/
drivers/mtd/nand/nand.c
+++ b/
drivers/mtd/nand/nand.c
@@
-54,8
+54,10
@@
static void nand_init_chip(struct mtd_info *mtd, struct nand_chip *nand,
if (nand_scan(mtd, maxchips) == 0) {
if (!mtd->name)
mtd->name = (char *)default_nand_name;
+#ifndef CONFIG_RELOC_FIXUP_WORKS
else
mtd->name += gd->reloc_off;
+#endif
#ifdef CONFIG_MTD_DEVICE
/*