aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2010-05-09 18:13:43 +0000
committerFlorian Fainelli <florian@openwrt.org>2010-05-09 18:13:43 +0000
commitb145752f2dfc13b9ce373e8c0c9cc87ca0e2b4b2 (patch)
treeb0b79fb1fe84c858b6c19bdc8deb20a9bacac66b /target
parent5eae0a2d3d2aaab98b2ae406300827f88a20e3b9 (diff)
downloadupstream-b145752f2dfc13b9ce373e8c0c9cc87ca0e2b4b2.tar.gz
upstream-b145752f2dfc13b9ce373e8c0c9cc87ca0e2b4b2.tar.bz2
upstream-b145752f2dfc13b9ce373e8c0c9cc87ca0e2b4b2.zip
[ar7] refresh kernel patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21410 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-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
3 files changed, 5 insertions, 5 deletions
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 484ce2d193..454f8ca741 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 884d46d481..34174db6af 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 102b829749..005822075f 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) {