diff options
| author | Florian Fainelli <florian@openwrt.org> | 2011-06-04 13:35:55 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2011-06-04 13:35:55 +0000 |
| commit | 763b58c30c60ccc3864e46cf916666766b060f23 (patch) | |
| tree | d78edd4703568b04a14abcf816ce98cfaa8b8bce /target/linux/lantiq/patches-2.6.39/210-mtd_uimage_split.patch | |
| parent | 3715fa33fe61c37e37c7bc49abe59a986938f3e9 (diff) | |
| download | upstream-763b58c30c60ccc3864e46cf916666766b060f23.tar.gz upstream-763b58c30c60ccc3864e46cf916666766b060f23.tar.bz2 upstream-763b58c30c60ccc3864e46cf916666766b060f23.zip | |
update to 2.6.39.1
patch from Peter Wagner
SVN-Revision: 27104
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 bca51a80d6..16173a3d27 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")) { |