Merge branch 'next' of ../next

[platform/kernel/u-boot.git] / drivers / mtd / onenand / onenand_uboot.c

diff --git a/drivers/mtd/onenand/onenand_uboot.c b/drivers/mtd/onenand/onenand_uboot.c
index a95b922..c642016 100644 (file)
--- a/drivers/mtd/onenand/onenand_uboot.c
+++ b/drivers/mtd/onenand/onenand_uboot.c
@@ -40,10 +40,12 @@ void onenand_init(void)
 
        onenand_scan(&onenand_mtd, 1);
 
+       if (onenand_chip.device_id & DEVICE_IS_FLEXONENAND)
+               puts("Flex-");
        puts("OneNAND: ");
-       print_size(onenand_mtd.size, "\n");
+       print_size(onenand_chip.chipsize, "\n");
 
-#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).