summaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-3.3/430-MIPS-BCM63XX-pass-caldata-info-to-flash.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2012-07-03 21:42:07 +0000
committerJonas Gorski <jogo@openwrt.org>2012-07-03 21:42:07 +0000
commit988147111c71cc07c0e2080424c201cd4ded7150 (patch)
tree2eeb1f97cbeb70163455c72422cc716ffc9be84c /target/linux/brcm63xx/patches-3.3/430-MIPS-BCM63XX-pass-caldata-info-to-flash.patch
parent1e2262df76cd989b22ed1ff7d5bf21bdb00a6bb6 (diff)
downloadmaster-31e0f0ae-988147111c71cc07c0e2080424c201cd4ded7150.tar.gz
master-31e0f0ae-988147111c71cc07c0e2080424c201cd4ded7150.tar.bz2
master-31e0f0ae-988147111c71cc07c0e2080424c201cd4ded7150.zip
bcm63xx: update patches to latest upstream versions
SVN-Revision: 32591
Diffstat (limited to 'target/linux/brcm63xx/patches-3.3/430-MIPS-BCM63XX-pass-caldata-info-to-flash.patch')
-rw-r--r--target/linux/brcm63xx/patches-3.3/430-MIPS-BCM63XX-pass-caldata-info-to-flash.patch8
1 files changed, 4 insertions, 4 deletions
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 0a406faed1..5553d0b37f 100644
--- 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)
+@@ -910,7 +910,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;
}