diff options
author | Florian Fainelli <florian@openwrt.org> | 2010-08-31 14:08:58 +0000 |
---|---|---|
committer | Florian Fainelli <florian@openwrt.org> | 2010-08-31 14:08:58 +0000 |
commit | 82e244fb28d8e35d96fcdd4ba3428d7579963f72 (patch) | |
tree | 05544ee76c9fb8de39d8fe15fa5036a4f6e42e2d | |
parent | 66f9c974c03db283551b7825cffe95a52ca964ad (diff) | |
download | upstream-82e244fb28d8e35d96fcdd4ba3428d7579963f72.tar.gz upstream-82e244fb28d8e35d96fcdd4ba3428d7579963f72.tar.bz2 upstream-82e244fb28d8e35d96fcdd4ba3428d7579963f72.zip |
refresh patches
SVN-Revision: 22849
6 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/ar7/patches-2.6.32/920-ar7part.patch b/target/linux/ar7/patches-2.6.32/920-ar7part.patch index 84958551be..984663547c 100644 --- a/target/linux/ar7/patches-2.6.32/920-ar7part.patch +++ b/target/linux/ar7/patches-2.6.32/920-ar7part.patch @@ -26,7 +26,7 @@ static int create_mtd_partitions(struct mtd_info *master, struct mtd_partition **pparts, unsigned long origin) -@@ -57,6 +63,16 @@ static int create_mtd_partitions(struct +@@ -57,6 +63,16 @@ static int create_mtd_partitions(struct int retries = 10; struct mtd_partition *ar7_parts; diff --git a/target/linux/ar7/patches-2.6.32/930-titan-platform.patch b/target/linux/ar7/patches-2.6.32/930-titan-platform.patch index 2678876ba4..cf6966dd10 100644 --- a/target/linux/ar7/patches-2.6.32/930-titan-platform.patch +++ b/target/linux/ar7/patches-2.6.32/930-titan-platform.patch @@ -1,6 +1,6 @@ --- a/arch/mips/ar7/platform.c +++ b/arch/mips/ar7/platform.c -@@ -131,6 +131,36 @@ static struct resource cpmac_high_res[] +@@ -131,6 +131,36 @@ static struct resource cpmac_high_res[] }, }; @@ -37,7 +37,7 @@ static struct resource vlynq_low_res[] = { { .name = "regs", -@@ -185,6 +215,60 @@ static struct resource vlynq_high_res[] +@@ -185,6 +215,60 @@ static struct resource vlynq_high_res[] }, }; @@ -192,7 +192,7 @@ static struct gpio_led default_leds[] = { { -@@ -300,6 +450,11 @@ static struct gpio_led default_leds[] = +@@ -300,6 +450,11 @@ static struct gpio_led default_leds[] = }, }; diff --git a/target/linux/ar7/patches-2.6.32/940-cpmac-titan.patch b/target/linux/ar7/patches-2.6.32/940-cpmac-titan.patch index 84bba9b1c3..d47ef38838 100644 --- a/target/linux/ar7/patches-2.6.32/940-cpmac-titan.patch +++ b/target/linux/ar7/patches-2.6.32/940-cpmac-titan.patch @@ -45,7 +45,7 @@ --- a/drivers/net/cpmac.c +++ b/drivers/net/cpmac.c -@@ -1153,6 +1153,8 @@ static int __devinit cpmac_probe(struct +@@ -1153,6 +1153,8 @@ static int __devinit cpmac_probe(struct goto fail; } diff --git a/target/linux/ar7/patches-2.6.32/950-cpmac_fallback_switch.patch b/target/linux/ar7/patches-2.6.32/950-cpmac_fallback_switch.patch index 005822075f..102b829749 100644 --- a/target/linux/ar7/patches-2.6.32/950-cpmac_fallback_switch.patch +++ b/target/linux/ar7/patches-2.6.32/950-cpmac_fallback_switch.patch @@ -1,6 +1,6 @@ --- a/drivers/net/cpmac.c +++ b/drivers/net/cpmac.c -@@ -1132,8 +1132,9 @@ static int __devinit cpmac_probe(struct +@@ -1132,8 +1132,9 @@ static int __devinit cpmac_probe(struct } if (phy_id == PHY_MAX_ADDR) { diff --git a/target/linux/ar7/patches-2.6.32/970-remove_fixed_phy.patch b/target/linux/ar7/patches-2.6.32/970-remove_fixed_phy.patch index 0e72267ab5..c6cdc063cf 100644 --- a/target/linux/ar7/patches-2.6.32/970-remove_fixed_phy.patch +++ b/target/linux/ar7/patches-2.6.32/970-remove_fixed_phy.patch @@ -47,7 +47,7 @@ res = platform_device_register(ar7_is_titan() ? &cpmac_low_titan : --- a/drivers/net/cpmac.c +++ b/drivers/net/cpmac.c -@@ -1117,21 +1117,17 @@ static int __devinit cpmac_probe(struct +@@ -1117,21 +1117,17 @@ static int __devinit cpmac_probe(struct pdata = pdev->dev.platform_data; diff --git a/target/linux/ar7/patches-2.6.32/971-cpmac_cleanup.patch b/target/linux/ar7/patches-2.6.32/971-cpmac_cleanup.patch index 754119a41c..ea13bb140e 100644 --- a/target/linux/ar7/patches-2.6.32/971-cpmac_cleanup.patch +++ b/target/linux/ar7/patches-2.6.32/971-cpmac_cleanup.patch @@ -17,7 +17,7 @@ static int __devinit cpmac_probe(struct platform_device *pdev) { int rc, phy_id; -@@ -1127,10 +1124,8 @@ static int __devinit cpmac_probe(struct +@@ -1127,10 +1124,8 @@ static int __devinit cpmac_probe(struct } if (phy_id == PHY_MAX_ADDR) { |