aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ixp4xx/patches-2.6.36/116-sidewinder_fis_location.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2010-11-02 12:21:31 +0000
committerImre Kaloz <kaloz@openwrt.org>2010-11-02 12:21:31 +0000
commitc1209bde02769789149b5e83840361fce0a2e070 (patch)
treeb60f67d807bfc65af47df8122e26d19ba5a9e212 /target/linux/ixp4xx/patches-2.6.36/116-sidewinder_fis_location.patch
parentd50ec0371001b81c5efacab6729b7cb0533d8adf (diff)
downloadupstream-c1209bde02769789149b5e83840361fce0a2e070.tar.gz
upstream-c1209bde02769789149b5e83840361fce0a2e070.tar.bz2
upstream-c1209bde02769789149b5e83840361fce0a2e070.zip
refresh 2.6.36 patches
SVN-Revision: 23776
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.36/116-sidewinder_fis_location.patch')
-rw-r--r--target/linux/ixp4xx/patches-2.6.36/116-sidewinder_fis_location.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.36/116-sidewinder_fis_location.patch b/target/linux/ixp4xx/patches-2.6.36/116-sidewinder_fis_location.patch
index 1d0a983980..96be37f1fe 100644
--- a/target/linux/ixp4xx/patches-2.6.36/116-sidewinder_fis_location.patch
+++ b/target/linux/ixp4xx/patches-2.6.36/116-sidewinder_fis_location.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/redboot.c
+++ b/drivers/mtd/redboot.c
-@@ -13,6 +13,8 @@
+@@ -31,6 +31,8 @@
#define BOARD_CONFIG_PART "boardconfig"
@@ -9,7 +9,7 @@
struct fis_image_desc {
unsigned char name[16]; // Null terminated name
uint32_t flash_base; // Address within FLASH of image
-@@ -30,7 +32,8 @@ struct fis_list {
+@@ -48,7 +50,8 @@ struct fis_list {
struct fis_list *next;
};
@@ -19,7 +19,7 @@
module_param(directory, int, 0);
static inline int redboot_checksum(struct fis_image_desc *img)
-@@ -59,6 +62,8 @@ static int parse_redboot_partitions(stru
+@@ -77,6 +80,8 @@ static int parse_redboot_partitions(stru
#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
static char nullstring[] = "unallocated";
#endif