mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
target/linux: refresh 2.6.32 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21566 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -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()) {
|
||||
|
||||
@@ -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[] =
|
||||
},
|
||||
};
|
||||
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user