Merge remote-tracking branch 'dt-rh/for-next'

[karo-tx-linux.git] / drivers / mtd / mtdcore.c

diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index 5e14d540ba2f623abb6438c4b6c204b991ed260b..7189089d87e3dbbca1dee15fe656a0a487b40dee 100644 (file)
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -37,6 +37,7 @@
 #include <linux/backing-dev.h>
 #include <linux/gfp.h>
 #include <linux/slab.h>
+#include <linux/major.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
@@ -157,6 +158,9 @@ static ssize_t mtd_type_show(struct device *dev,
        case MTD_UBIVOLUME:
                type = "ubi";
                break;
+       case MTD_MLCNANDFLASH:
+               type = "mlc-nand";
+               break;
        default:
                type = "unknown";
        }