Merge branch 'master' of git://git.denx.de/u-boot-samsung

[u-boot] / drivers / mtd / nand / nand.c

diff --git a/drivers/mtd/nand/nand.c b/drivers/mtd/nand/nand.c
index d3691151f0513eb3c613d43dc29bbcf1ad4a7ab4..47d6872fd03cd1ce277c04d18d187e4ccfb5f34b 100644 (file)
--- a/drivers/mtd/nand/nand.c
+++ b/drivers/mtd/nand/nand.c
@@ -54,10 +54,12 @@ 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_PARTITIONS
+#ifdef CONFIG_MTD_DEVICE
                        /*
                         * Add MTD device so that we can reference it later
                         * via the mtdcore infrastructure (e.g. ubi).