aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar7
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2010-05-24 20:35:46 +0000
committerNicolas Thill <nico@openwrt.org>2010-05-24 20:35:46 +0000
commit6598259ef5e5ba6a430a2777f0d81c912223ccf7 (patch)
tree03d621ef58de563a798a2ac4ee8ddef85a292a06 /target/linux/ar7
parentcfbeeb7b8539940f0be3d3d72242655793ac51b9 (diff)
downloadupstream-6598259ef5e5ba6a430a2777f0d81c912223ccf7.tar.gz
upstream-6598259ef5e5ba6a430a2777f0d81c912223ccf7.tar.bz2
upstream-6598259ef5e5ba6a430a2777f0d81c912223ccf7.zip
target/linux: refresh 2.6.32 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21566 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar7')
-rw-r--r--target/linux/ar7/patches-2.6.32/140-uart_port_ar7.patch10
-rw-r--r--target/linux/ar7/patches-2.6.32/930-titan-platform.patch6
-rw-r--r--target/linux/ar7/patches-2.6.32/940-cpmac-titan.patch2
-rw-r--r--target/linux/ar7/patches-2.6.32/950-cpmac_fallback_switch.patch2
4 files changed, 9 insertions, 11 deletions
diff --git a/target/linux/ar7/patches-2.6.32/140-uart_port_ar7.patch b/target/linux/ar7/patches-2.6.32/140-uart_port_ar7.patch
index 12c9483d75..3353c21fb1 100644
--- a/target/linux/ar7/patches-2.6.32/140-uart_port_ar7.patch
+++ b/target/linux/ar7/patches-2.6.32/140-uart_port_ar7.patch
@@ -6,11 +6,9 @@
Signed-off-by: Florian Fainelli <florian@openwrt.org>
-Index: linux-2.6.32.12/arch/mips/ar7/platform.c
-===================================================================
---- linux-2.6.32.12.orig/arch/mips/ar7/platform.c 2010-05-15 18:01:11.000000000 +0200
-+++ linux-2.6.32.12/arch/mips/ar7/platform.c 2010-05-15 18:02:44.000000000 +0200
-@@ -509,7 +509,7 @@
+--- a/arch/mips/ar7/platform.c
++++ b/arch/mips/ar7/platform.c
+@@ -509,7 +509,7 @@ static int __init ar7_register_devices(v
memset(uart_port, 0, sizeof(struct uart_port) * 2);
@@ -19,7 +17,7 @@ Index: linux-2.6.32.12/arch/mips/ar7/platform.c
uart_port[0].line = 0;
uart_port[0].irq = AR7_IRQ_UART0;
uart_port[0].uartclk = ar7_bus_freq() / 2;
-@@ -524,7 +524,7 @@
+@@ -524,7 +524,7 @@ static int __init ar7_register_devices(v
/* Only TNETD73xx have a second serial port */
if (ar7_has_second_uart()) {
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 454f8ca741..484ce2d193 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 34174db6af..884d46d481 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) {