diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2011-05-15 17:23:02 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2011-05-15 17:23:02 +0000 |
| commit | f708e805736f9ba326e4fa4d4ffe3adc05f999b7 (patch) | |
| tree | 327a63216af1cc1f8e96c29c62803f2582694317 /target/linux/generic/patches-2.6.38/400-rootfs_split.patch | |
| parent | 463ae018b18088e4994bf4031c26bd76104771ce (diff) | |
| download | upstream-f708e805736f9ba326e4fa4d4ffe3adc05f999b7.tar.gz upstream-f708e805736f9ba326e4fa4d4ffe3adc05f999b7.tar.bz2 upstream-f708e805736f9ba326e4fa4d4ffe3adc05f999b7.zip | |
kernel: update kernel from 2.6.38.2 to 2.6.38.6 and refresh patches
Thank you Peter Wagner for the patch. I refreshed the kernel patches and added the md5sum of the kernel.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26905 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.38/400-rootfs_split.patch')
| -rw-r--r-- | target/linux/generic/patches-2.6.38/400-rootfs_split.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-2.6.38/400-rootfs_split.patch b/target/linux/generic/patches-2.6.38/400-rootfs_split.patch index 9d04b7ca4f..5158266d2b 100644 --- a/target/linux/generic/patches-2.6.38/400-rootfs_split.patch +++ b/target/linux/generic/patches-2.6.38/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 -@@ -652,6 +801,9 @@ int add_mtd_partitions(struct mtd_info * +@@ -652,6 +803,9 @@ int add_mtd_partitions(struct mtd_info * struct mtd_part *slave; uint64_t cur_offset = 0; int i; @@ -203,7 +203,7 @@ printk(KERN_NOTICE "Creating %d MTD partitions on \"%s\":\n", nbparts, master->name); -@@ -666,6 +818,21 @@ int add_mtd_partitions(struct mtd_info * +@@ -666,6 +820,21 @@ int add_mtd_partitions(struct mtd_info * add_mtd_device(&slave->mtd); @@ -225,7 +225,7 @@ cur_offset = slave->offset + slave->mtd.size; } -@@ -673,6 +840,32 @@ int add_mtd_partitions(struct mtd_info * +@@ -673,6 +842,32 @@ int add_mtd_partitions(struct mtd_info * } EXPORT_SYMBOL(add_mtd_partitions); @@ -260,7 +260,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; } |