refresh kernel patches
SVN-Revision: 21410
This commit is contained in:
parent
655b43acc4
commit
d3486f7942
@ -1,6 +1,6 @@
|
|||||||
--- a/arch/mips/ar7/platform.c
|
--- a/arch/mips/ar7/platform.c
|
||||||
+++ b/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[] = {
|
static struct resource vlynq_low_res[] = {
|
||||||
{
|
{
|
||||||
.name = "regs",
|
.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[] = {
|
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
|
--- a/drivers/net/cpmac.c
|
||||||
+++ b/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;
|
goto fail;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/drivers/net/cpmac.c
|
--- a/drivers/net/cpmac.c
|
||||||
+++ b/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) {
|
if (phy_id == PHY_MAX_ADDR) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user