aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar7/patches-3.6/972-cpmac_fixup.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-11-27 18:42:49 +0000
committerFlorian Fainelli <florian@openwrt.org>2012-11-27 18:42:49 +0000
commitee16e144bb2ece81273f1e2712ba60e1e59d1563 (patch)
treeab457a8792e8a3de518cee2ef99e90ef258df8d0 /target/linux/ar7/patches-3.6/972-cpmac_fixup.patch
parent7196f5d7c8ec0de8ae06cf664adbf8cdda2c594d (diff)
downloadupstream-ee16e144bb2ece81273f1e2712ba60e1e59d1563.tar.gz
upstream-ee16e144bb2ece81273f1e2712ba60e1e59d1563.tar.bz2
upstream-ee16e144bb2ece81273f1e2712ba60e1e59d1563.zip
use physmap-flash part_probe_types
Signed-off-by: Florian Fainelli <florian@openwrt.org> SVN-Revision: 34398
Diffstat (limited to 'target/linux/ar7/patches-3.6/972-cpmac_fixup.patch')
-rw-r--r--target/linux/ar7/patches-3.6/972-cpmac_fixup.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ar7/patches-3.6/972-cpmac_fixup.patch b/target/linux/ar7/patches-3.6/972-cpmac_fixup.patch
index 561ef9947f..b25fc87c7f 100644
--- a/target/linux/ar7/patches-3.6/972-cpmac_fixup.patch
+++ b/target/linux/ar7/patches-3.6/972-cpmac_fixup.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/ar7/platform.c
+++ b/arch/mips/ar7/platform.c
-@@ -709,26 +709,23 @@ static int __init ar7_register_devices(v
+@@ -712,26 +712,23 @@ static int __init ar7_register_devices(v
}
if (ar7_has_high_cpmac()) {
@@ -40,7 +40,7 @@
detect_leds();
res = platform_device_register(&ar7_gpio_leds);
-@@ -741,8 +738,10 @@ static int __init ar7_register_devices(v
+@@ -744,8 +741,10 @@ static int __init ar7_register_devices(v
/* Register watchdog only if enabled in hardware */
bootcr = ioremap_nocache(AR7_REGS_DCL, 4);