diff options
| author | Florian Fainelli <florian@openwrt.org> | 2012-03-02 13:18:56 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2012-03-02 13:18:56 +0000 |
| commit | 4c07d3a6267411a5f2a253bc303864cabcbcefe9 (patch) | |
| tree | a6e81eb17e08084625d7746ff1ebe9a5390dadde /target/linux/generic/patches-2.6.36/065-rootfs_split.patch | |
| parent | 57dca7028752b6d5ab7673957f722dd716bf82c6 (diff) | |
| download | upstream-4c07d3a6267411a5f2a253bc303864cabcbcefe9.tar.gz upstream-4c07d3a6267411a5f2a253bc303864cabcbcefe9.tar.bz2 upstream-4c07d3a6267411a5f2a253bc303864cabcbcefe9.zip | |
[kernel/2.6.36] refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30779 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.36/065-rootfs_split.patch')
| -rw-r--r-- | target/linux/generic/patches-2.6.36/065-rootfs_split.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-2.6.36/065-rootfs_split.patch b/target/linux/generic/patches-2.6.36/065-rootfs_split.patch index 7e1fab106d..b97f55c611 100644 --- a/target/linux/generic/patches-2.6.36/065-rootfs_split.patch +++ b/target/linux/generic/patches-2.6.36/065-rootfs_split.patch @@ -190,7 +190,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 -@@ -539,7 +685,7 @@ int add_mtd_partitions(struct mtd_info * +@@ -539,7 +687,7 @@ int add_mtd_partitions(struct mtd_info * { struct mtd_part *slave; uint64_t cur_offset = 0; @@ -199,7 +199,7 @@ printk(KERN_NOTICE "Creating %d MTD partitions on \"%s\":\n", nbparts, master->name); -@@ -547,6 +693,21 @@ int add_mtd_partitions(struct mtd_info * +@@ -547,6 +695,21 @@ int add_mtd_partitions(struct mtd_info * slave = add_one_partition(master, parts + i, i, cur_offset); if (!slave) return -ENOMEM; @@ -221,7 +221,7 @@ cur_offset = slave->offset + slave->mtd.size; } -@@ -554,6 +715,32 @@ int add_mtd_partitions(struct mtd_info * +@@ -554,6 +717,32 @@ int add_mtd_partitions(struct mtd_info * } EXPORT_SYMBOL(add_mtd_partitions); @@ -556,7 +556,7 @@ #include <linux/mtd/mtd.h> #include <linux/mtd/map.h> -@@ -854,6 +855,13 @@ static int mtd_ioctl(struct file *file, +@@ -854,6 +855,13 @@ static int mtd_ioctl(struct file *file, file->f_pos = 0; break; } |