diff options
| author | Florian Fainelli <florian@openwrt.org> | 2011-05-20 10:06:11 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2011-05-20 10:06:11 +0000 |
| commit | f9f8dcfa705d84666a58aa71054d0223421f2005 (patch) | |
| tree | 8bd1c15fa63aeb1312ded942d36576ebd0bee775 /target/linux/generic/patches-2.6.37/400-rootfs_split.patch | |
| parent | f0a99c1692afdf9883060083e8ea6107936c6c17 (diff) | |
| download | upstream-f9f8dcfa705d84666a58aa71054d0223421f2005.tar.gz upstream-f9f8dcfa705d84666a58aa71054d0223421f2005.tar.bz2 upstream-f9f8dcfa705d84666a58aa71054d0223421f2005.zip | |
refresh 2.6.37 patches
SVN-Revision: 26955
Diffstat (limited to 'target/linux/generic/patches-2.6.37/400-rootfs_split.patch')
| -rw-r--r-- | target/linux/generic/patches-2.6.37/400-rootfs_split.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-2.6.37/400-rootfs_split.patch b/target/linux/generic/patches-2.6.37/400-rootfs_split.patch index 1f61bfdd36..00210c0957 100644 --- a/target/linux/generic/patches-2.6.37/400-rootfs_split.patch +++ b/target/linux/generic/patches-2.6.37/400-rootfs_split.patch @@ -193,7 +193,7 @@ /* * This function, given a master MTD object and a partition table, creates * and registers slave MTD objects which are bound to the master according to -@@ -633,7 +782,7 @@ int add_mtd_partitions(struct mtd_info * +@@ -633,7 +784,7 @@ int add_mtd_partitions(struct mtd_info * { struct mtd_part *slave; uint64_t cur_offset = 0; @@ -202,7 +202,7 @@ printk(KERN_NOTICE "Creating %d MTD partitions on \"%s\":\n", nbparts, master->name); -@@ -648,6 +797,21 @@ int add_mtd_partitions(struct mtd_info * +@@ -648,6 +799,21 @@ int add_mtd_partitions(struct mtd_info * add_mtd_device(&slave->mtd); @@ -224,7 +224,7 @@ cur_offset = slave->offset + slave->mtd.size; } -@@ -655,6 +819,32 @@ int add_mtd_partitions(struct mtd_info * +@@ -655,6 +821,32 @@ int add_mtd_partitions(struct mtd_info * } EXPORT_SYMBOL(add_mtd_partitions); @@ -259,7 +259,7 @@ --- a/drivers/mtd/mtdchar.c +++ b/drivers/mtd/mtdchar.c -@@ -841,6 +841,13 @@ static int mtd_ioctl(struct file *file, +@@ -841,6 +841,13 @@ static int mtd_ioctl(struct file *file, file->f_pos = 0; break; } |