f875e18fd2
This removes one patch which was applied upstream with commit 67b9bcd36906e12a15ffec19463afbbd6a41660e. All other patches were refreshed. Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> SVN-Revision: 48203
26 lines
703 B
Diff
26 lines
703 B
Diff
--- a/drivers/mtd/mtdcore.c
|
|
+++ b/drivers/mtd/mtdcore.c
|
|
@@ -39,6 +39,7 @@
|
|
#include <linux/slab.h>
|
|
#include <linux/reboot.h>
|
|
#include <linux/kconfig.h>
|
|
+#include <linux/root_dev.h>
|
|
|
|
#include <linux/mtd/mtd.h>
|
|
#include <linux/mtd/partitions.h>
|
|
@@ -464,6 +465,15 @@ int add_mtd_device(struct mtd_info *mtd)
|
|
of this try_ nonsense, and no bitching about it
|
|
either. :) */
|
|
__module_get(THIS_MODULE);
|
|
+
|
|
+ if (!strcmp(mtd->name, "rootfs") &&
|
|
+ config_enabled(CONFIG_MTD_ROOTFS_ROOT_DEV) &&
|
|
+ ROOT_DEV == 0) {
|
|
+ pr_notice("mtd: device %d (%s) set to be root filesystem\n",
|
|
+ mtd->index, mtd->name);
|
|
+ ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, mtd->index);
|
|
+ }
|
|
+
|
|
return 0;
|
|
|
|
fail_added:
|