summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-01-29 18:55:19 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2011-01-29 18:55:19 +0100
commite2ef7f712886da38d8ddfe594f1a08e2292820ad (patch)
tree4ea45f7aa9f336add208164291f4b433caee86f1
parent3a5c8818557c3db3fd0c79353b0f29edb6faf857 (diff)
fix mtd rootfs patch
-rw-r--r--target/linux/patches/2.6.37/mtd-rootfs.patch17
1 files changed, 8 insertions, 9 deletions
diff --git a/target/linux/patches/2.6.37/mtd-rootfs.patch b/target/linux/patches/2.6.37/mtd-rootfs.patch
index 74a94ff7e..9db687c90 100644
--- a/target/linux/patches/2.6.37/mtd-rootfs.patch
+++ b/target/linux/patches/2.6.37/mtd-rootfs.patch
@@ -1,6 +1,5 @@
-diff -Nur linux-2.6.37.orig/drivers/mtd/mtdpart.c linux-2.6.37/drivers/mtd/mtdpart.c
---- linux-2.6.37.orig/drivers/mtd/mtdpart.c 2011-01-05 01:50:19.000000000 +0100
-+++ linux-2.6.37/drivers/mtd/mtdpart.c 2011-01-18 00:23:32.000000000 +0100
+--- linux-2.6.37.orig/drivers/mtd/mtdpart.c
++++ linux-2.6.37/drivers/mtd/mtdpart.c
@@ -30,6 +30,7 @@
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
@@ -9,18 +8,18 @@ diff -Nur linux-2.6.37.orig/drivers/mtd/mtdpart.c linux-2.6.37/drivers/mtd/mtdpa
/* Our partition linked list */
static LIST_HEAD(mtd_partitions);
-@@ -642,6 +643,14 @@
+@@ -641,6 +642,14 @@
+ slave = allocate_partition(master, parts + i, i, cur_offset);
if (IS_ERR(slave))
return PTR_ERR(slave);
-
-+ if (!strcmp(parts[i].name, "rootfs")) {
++
++ if (strcmp(parts[i].name, "rootfs") == 0) {
+ if (ROOT_DEV == 0) {
+ printk(KERN_NOTICE "mtd: partition \"rootfs\" "
+ "set to be root filesystem\n");
-+ ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, slave->mtd.index);
++ ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, i);
+ }
+ }
-+
+
mutex_lock(&mtd_partitions_mutex);
list_add(&slave->list, &mtd_partitions);
- mutex_unlock(&mtd_partitions_mutex);