aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2015-04-12 17:30:41 +0000
committerImre Kaloz <kaloz@openwrt.org>2015-04-12 17:30:41 +0000
commitceb7321e13971d019fc50438ae8ea3f04caf6b3c (patch)
treec8ded3ebe556b04968a630a135b808a56178a6bb
parentb0ad24f0d5bce342b432dd3a8bbaca7892c7b165 (diff)
downloadupstream-ceb7321e13971d019fc50438ae8ea3f04caf6b3c.tar.gz
upstream-ceb7321e13971d019fc50438ae8ea3f04caf6b3c.tar.bz2
upstream-ceb7321e13971d019fc50438ae8ea3f04caf6b3c.zip
mvebu: refresh patches
Signed-off-by: Imre Kaloz <kaloz@openwrt.org> SVN-Revision: 45401
-rw-r--r--target/linux/mvebu/patches-3.18/150-use_the_cpufreq-dt_platform_data_for_independent_clocks.patch4
-rw-r--r--target/linux/mvebu/patches-3.18/206-mvebu_wrt1900ac_use_pwm-fan_rather_than_gpio-fan.patch6
-rw-r--r--target/linux/mvebu/patches-4.0/206-mvebu_wrt1900ac_use_pwm-fan_rather_than_gpio-fan.patch6
3 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/mvebu/patches-3.18/150-use_the_cpufreq-dt_platform_data_for_independent_clocks.patch b/target/linux/mvebu/patches-3.18/150-use_the_cpufreq-dt_platform_data_for_independent_clocks.patch
index c338aeffcf..1fea44f8e8 100644
--- a/target/linux/mvebu/patches-3.18/150-use_the_cpufreq-dt_platform_data_for_independent_clocks.patch
+++ b/target/linux/mvebu/patches-3.18/150-use_the_cpufreq-dt_platform_data_for_independent_clocks.patch
@@ -21,7 +21,7 @@ Signed-off-by: Arnd Bergmann <arnd@arndb.de>
#include <linux/delay.h>
#include <linux/init.h>
#include <linux/io.h>
-@@ -572,6 +573,10 @@ int mvebu_pmsu_dfs_request(int cpu)
+@@ -586,6 +587,10 @@ int mvebu_pmsu_dfs_request(int cpu)
return 0;
}
@@ -32,7 +32,7 @@ Signed-off-by: Arnd Bergmann <arnd@arndb.de>
static int __init armada_xp_pmsu_cpufreq_init(void)
{
struct device_node *np;
-@@ -644,7 +649,8 @@ static int __init armada_xp_pmsu_cpufreq
+@@ -658,7 +663,8 @@ static int __init armada_xp_pmsu_cpufreq
}
}
diff --git a/target/linux/mvebu/patches-3.18/206-mvebu_wrt1900ac_use_pwm-fan_rather_than_gpio-fan.patch b/target/linux/mvebu/patches-3.18/206-mvebu_wrt1900ac_use_pwm-fan_rather_than_gpio-fan.patch
index 8af5eba5b0..dddd67a95a 100644
--- a/target/linux/mvebu/patches-3.18/206-mvebu_wrt1900ac_use_pwm-fan_rather_than_gpio-fan.patch
+++ b/target/linux/mvebu/patches-3.18/206-mvebu_wrt1900ac_use_pwm-fan_rather_than_gpio-fan.patch
@@ -7,9 +7,9 @@ Signed-off-by: Andrew Lunn <andrew@lunn.ch>
arch/arm/boot/dts/armada-xp-wrt1900ac.dts | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
---- a/arch/arm/boot/dts/armada-xp-mamba.dts
-+++ b/arch/arm/boot/dts/armada-xp-mamba.dts
-@@ -302,13 +302,11 @@
+--- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
++++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
+@@ -407,13 +407,11 @@
};
};
diff --git a/target/linux/mvebu/patches-4.0/206-mvebu_wrt1900ac_use_pwm-fan_rather_than_gpio-fan.patch b/target/linux/mvebu/patches-4.0/206-mvebu_wrt1900ac_use_pwm-fan_rather_than_gpio-fan.patch
index 8af5eba5b0..dddd67a95a 100644
--- a/target/linux/mvebu/patches-4.0/206-mvebu_wrt1900ac_use_pwm-fan_rather_than_gpio-fan.patch
+++ b/target/linux/mvebu/patches-4.0/206-mvebu_wrt1900ac_use_pwm-fan_rather_than_gpio-fan.patch
@@ -7,9 +7,9 @@ Signed-off-by: Andrew Lunn <andrew@lunn.ch>
arch/arm/boot/dts/armada-xp-wrt1900ac.dts | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
---- a/arch/arm/boot/dts/armada-xp-mamba.dts
-+++ b/arch/arm/boot/dts/armada-xp-mamba.dts
-@@ -302,13 +302,11 @@
+--- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
++++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
+@@ -407,13 +407,11 @@
};
};