[package] busybox: implement ms static routes option in udhcpc (#6435)

[openwrt.git] / target / linux / ixp4xx / patches-2.6.36 / 116-sidewinder_fis_location.patch

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 1d0a983..96be37f 100644 (file)
--- 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
 --- a/drivers/mtd/redboot.c
 +++ b/drivers/mtd/redboot.c

-@@ -13,6 +13,8 @@
+@@ -31,6 +31,8 @@

  
  #define BOARD_CONFIG_PART             "boardconfig"
  
  
  #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
  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;
  };
  
        struct fis_list *next;
  };
  


@@ -19,7 +19,7 @@
  module_param(directory, int, 0);
  
  static inline int redboot_checksum(struct fis_image_desc *img)
  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
  #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
        static char nullstring[] = "unallocated";
  #endif