diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2008-08-22 15:37:19 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2008-08-22 15:37:19 +0000 |
commit | 80b1408ef97a63e0d1e3977cefecd00f9c085959 (patch) | |
tree | 074f7229f0cedb176a1a09354cbf032ed532b025 /target/linux/generic-2.6/patches-2.6.26/071-redboot_boardconfig.patch | |
parent | 54bcffc5e08f2cad6854dbdfaa05d597d1df0a8b (diff) | |
download | upstream-80b1408ef97a63e0d1e3977cefecd00f9c085959.tar.gz upstream-80b1408ef97a63e0d1e3977cefecd00f9c085959.tar.bz2 upstream-80b1408ef97a63e0d1e3977cefecd00f9c085959.zip |
[kernel] update to 2.6.26.3 and 2.6.25.16
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12371 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.26/071-redboot_boardconfig.patch')
-rw-r--r-- | target/linux/generic-2.6/patches-2.6.26/071-redboot_boardconfig.patch | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.26/071-redboot_boardconfig.patch b/target/linux/generic-2.6/patches-2.6.26/071-redboot_boardconfig.patch index 48c7d52cb7..07f569a731 100644 --- a/target/linux/generic-2.6/patches-2.6.26/071-redboot_boardconfig.patch +++ b/target/linux/generic-2.6/patches-2.6.26/071-redboot_boardconfig.patch @@ -1,7 +1,5 @@ -Index: linux-2.6.26.2/drivers/mtd/redboot.c -=================================================================== ---- linux-2.6.26.2.orig/drivers/mtd/redboot.c 2008-08-19 19:32:17.000000000 +0200 -+++ linux-2.6.26.2/drivers/mtd/redboot.c 2008-08-19 19:47:34.000000000 +0200 +--- a/drivers/mtd/redboot.c ++++ b/drivers/mtd/redboot.c @@ -13,6 +13,8 @@ #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> @@ -19,7 +17,7 @@ Index: linux-2.6.26.2/drivers/mtd/redboot.c int nrparts = 0; struct fis_image_desc *buf; struct mtd_partition *parts; -@@ -217,14 +220,14 @@ +@@ -211,14 +214,14 @@ } } #endif @@ -36,7 +34,7 @@ Index: linux-2.6.26.2/drivers/mtd/redboot.c #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED if (nulllen > 0) { strcpy(nullname, nullstring); -@@ -243,6 +246,8 @@ +@@ -237,6 +240,8 @@ } #endif for ( ; i<nrparts; i++) { @@ -45,7 +43,7 @@ Index: linux-2.6.26.2/drivers/mtd/redboot.c parts[i].size = fl->img->size; parts[i].offset = fl->img->flash_base; parts[i].name = names; -@@ -276,6 +281,14 @@ +@@ -270,6 +275,14 @@ fl = fl->next; kfree(tmp_fl); } |