diff options
| author | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-06-04 13:35:55 +0000 |
|---|---|---|
| committer | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-06-04 13:35:55 +0000 |
| commit | e056550af06f304bbaf1605f3787abc5b0b11552 (patch) | |
| tree | 3350e421172690b9f7c942effd46a963e6cb1f3e /target/linux/lantiq/patches-2.6.39/210-mtd_uimage_split.patch | |
| parent | 3ca02ebf53c321202aa7c25f4bdf20b5d74ac907 (diff) | |
[kernel] update to 2.6.39.1
patch from Peter Wagner
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27104 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/lantiq/patches-2.6.39/210-mtd_uimage_split.patch')
| -rw-r--r-- | target/linux/lantiq/patches-2.6.39/210-mtd_uimage_split.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/lantiq/patches-2.6.39/210-mtd_uimage_split.patch b/target/linux/lantiq/patches-2.6.39/210-mtd_uimage_split.patch index bca51a80d..16173a3d2 100644 --- a/target/linux/lantiq/patches-2.6.39/210-mtd_uimage_split.patch +++ b/target/linux/lantiq/patches-2.6.39/210-mtd_uimage_split.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/Kconfig +++ b/drivers/mtd/Kconfig -@@ -63,6 +63,10 @@ +@@ -57,6 +57,10 @@ config MTD_ROOTFS_SPLIT depends on MTD_PARTITIONS default y @@ -10,10 +10,10 @@ + config MTD_REDBOOT_PARTS tristate "RedBoot partition table parsing" - depends on MTD_PARTITIONS + ---help--- --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c -@@ -724,6 +724,82 @@ +@@ -860,6 +860,82 @@ static int refresh_rootfs_split(struct m } #endif /* CONFIG_MTD_ROOTFS_SPLIT */ @@ -96,9 +96,9 @@ /* * 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 -@@ -748,6 +824,17 @@ - if (!slave) - return -ENOMEM; +@@ -893,6 +969,17 @@ int add_mtd_partitions(struct mtd_info * + + add_mtd_device(&slave->mtd); +#ifdef CONFIG_MTD_UIMAGE_SPLIT + if (!strcmp(parts[i].name, "linux")) { |