refresh patches

SVN-Revision: 22849
owl
Florian Fainelli 2010-08-31 14:08:58 +00:00
parent 66f9c974c0
commit 82e244fb28
6 changed files with 8 additions and 8 deletions

View File

@ -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;

View File

@ -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[] =
},
};

View File

@ -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;
}

View File

@ -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) {

View File

@ -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;

View File

@ -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) {