aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.36/071-redboot_boardconfig.patch
diff options
context:
space:
mode:
authorAlexandros C. Couloumbis <alex@ozo.com>2010-10-05 08:50:54 +0000
committerAlexandros C. Couloumbis <alex@ozo.com>2010-10-05 08:50:54 +0000
commit11c45f64fe699fc2dd97fa1a0015f28a7ba4f4da (patch)
treecdfe45082cf11d9c3d0d51f1315c08b833b4813f /target/linux/generic/patches-2.6.36/071-redboot_boardconfig.patch
parent978ecae6855efdd2806c2975b85b22c9b2833862 (diff)
downloadupstream-11c45f64fe699fc2dd97fa1a0015f28a7ba4f4da.tar.gz
upstream-11c45f64fe699fc2dd97fa1a0015f28a7ba4f4da.tar.bz2
upstream-11c45f64fe699fc2dd97fa1a0015f28a7ba4f4da.zip
linux/generic: refresh 2.6.36 kernel patches
SVN-Revision: 23237
Diffstat (limited to 'target/linux/generic/patches-2.6.36/071-redboot_boardconfig.patch')
-rw-r--r--target/linux/generic/patches-2.6.36/071-redboot_boardconfig.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic/patches-2.6.36/071-redboot_boardconfig.patch b/target/linux/generic/patches-2.6.36/071-redboot_boardconfig.patch
index f9bc4fe36b..9188cee29c 100644
--- a/target/linux/generic/patches-2.6.36/071-redboot_boardconfig.patch
+++ b/target/linux/generic/patches-2.6.36/071-redboot_boardconfig.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/redboot.c
+++ b/drivers/mtd/redboot.c
-@@ -11,6 +11,8 @@
+@@ -29,6 +29,8 @@
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
@@ -9,7 +9,7 @@
struct fis_image_desc {
unsigned char name[16]; // Null terminated name
uint32_t flash_base; // Address within FLASH of image
-@@ -41,6 +43,7 @@ static int parse_redboot_partitions(stru
+@@ -59,6 +61,7 @@ static int parse_redboot_partitions(stru
struct mtd_partition **pparts,
unsigned long fis_origin)
{
@@ -17,7 +17,7 @@
int nrparts = 0;
struct fis_image_desc *buf;
struct mtd_partition *parts;
-@@ -209,14 +212,14 @@ static int parse_redboot_partitions(stru
+@@ -227,14 +230,14 @@ static int parse_redboot_partitions(stru
}
}
#endif
@@ -34,7 +34,7 @@
#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
if (nulllen > 0) {
strcpy(nullname, nullstring);
-@@ -235,6 +238,8 @@ static int parse_redboot_partitions(stru
+@@ -253,6 +256,8 @@ static int parse_redboot_partitions(stru
}
#endif
for ( ; i<nrparts; i++) {
@@ -43,7 +43,7 @@
parts[i].size = fl->img->size;
parts[i].offset = fl->img->flash_base;
parts[i].name = names;
-@@ -268,6 +273,14 @@ static int parse_redboot_partitions(stru
+@@ -286,6 +291,14 @@ static int parse_redboot_partitions(stru
fl = fl->next;
kfree(tmp_fl);
}