These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / mtd / onenand / generic.c

diff --git a/kernel/drivers/mtd/onenand/generic.c b/kernel/drivers/mtd/onenand/generic.c
index 32a216d..125da34 100644 (file)
--- a/kernel/drivers/mtd/onenand/generic.c
+++ b/kernel/drivers/mtd/onenand/generic.c
@@ -18,7 +18,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/onenand.h>
 #include <linux/mtd/partitions.h>
-#include <asm/io.h>
+#include <linux/io.h>
 
 /*
  * Note: Driver name and platform data format have been updated!
@@ -60,9 +60,8 @@ static int generic_onenand_probe(struct platform_device *pdev)
        info->onenand.mmcontrol = pdata ? pdata->mmcontrol : NULL;
        info->onenand.irq = platform_get_irq(pdev, 0);
 
-       info->mtd.name = dev_name(&pdev->dev);
+       info->mtd.dev.parent = &pdev->dev;
        info->mtd.priv = &info->onenand;
-       info->mtd.owner = THIS_MODULE;
 
        if (onenand_scan(&info->mtd, 1)) {
                err = -ENXIO;