bcm63xx: reorder patches

[openwrt/staging/lynxis/omap.git] / target / linux / brcm63xx / patches-3.3 / 430-MIPS-BCM63XX-pass-caldata-info-to-flash.patch

diff --git a/target/linux/brcm63xx/patches-3.3/430-MIPS-BCM63XX-pass-caldata-info-to-flash.patch b/target/linux/brcm63xx/patches-3.3/430-MIPS-BCM63XX-pass-caldata-info-to-flash.patch
index 0a406faed17bc7ed6bda154a5c2fa1fffe5e3df6..2c7368477e66a9029060e04b0d531343f8c67eb4 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/430-MIPS-BCM63XX-pass-caldata-info-to-flash.patch
+++ b/target/linux/brcm63xx/patches-3.3/430-MIPS-BCM63XX-pass-caldata-info-to-flash.patch
@@ -11,7 +11,7 @@ Subject: [PATCH 69/80] MIPS: BCM63XX: pass caldata info to flash
 
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -908,7 +908,7 @@ int __init board_register_devices(void)
+@@ -912,7 +912,7 @@ int __init board_register_devices(void)
        if (board.num_spis)
                spi_register_board_info(board.spis, board.num_spis);
  
@@ -22,7 +22,7 @@ Subject: [PATCH 69/80] MIPS: BCM63XX: pass caldata info to flash
        while (led_count < ARRAY_SIZE(board.leds) && board.leds[led_count].name)
 --- a/arch/mips/bcm63xx/dev-flash.c
 +++ b/arch/mips/bcm63xx/dev-flash.c
-@@ -34,12 +34,15 @@ static struct mtd_partition mtd_partitio
+@@ -35,12 +35,15 @@ static struct mtd_partition mtd_partitio
        }
  };
  
@@ -38,7 +38,7 @@ Subject: [PATCH 69/80] MIPS: BCM63XX: pass caldata info to flash
  };
  
  static struct resource mtd_resources[] = {
-@@ -61,6 +64,7 @@ static struct platform_device mtd_dev =
+@@ -62,6 +65,7 @@ static struct platform_device mtd_dev =
  
  static struct flash_platform_data bcm63xx_flash_data = {
        .part_probe_types       = bcm63xx_part_types,
@@ -46,7 +46,7 @@ Subject: [PATCH 69/80] MIPS: BCM63XX: pass caldata info to flash
  };
  
  static struct spi_board_info bcm63xx_spi_flash_info[] = {
-@@ -125,10 +129,13 @@ static int __init bcm63xx_detect_flash_t
+@@ -130,10 +134,13 @@ static int __init bcm63xx_detect_flash_t
        return 0;
  }