summaryrefslogtreecommitdiffstats
path: root/target/linux/mxs/patches-4.1/103-dt-enable-regulator.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2015-08-05 13:55:14 +0000
committerJonas Gorski <jogo@openwrt.org>2015-08-05 13:55:14 +0000
commitcaa73eb95c490e850d517cb558e4161c2f06d86f (patch)
tree615a1a64e1cfaaf0220f5c9ae49d465ee8566168 /target/linux/mxs/patches-4.1/103-dt-enable-regulator.patch
parent0b15f91ed6d556aafcd56ffabb9da7ba83b317f5 (diff)
downloadmaster-31e0f0ae-caa73eb95c490e850d517cb558e4161c2f06d86f.tar.gz
master-31e0f0ae-caa73eb95c490e850d517cb558e4161c2f06d86f.tar.bz2
master-31e0f0ae-caa73eb95c490e850d517cb558e4161c2f06d86f.zip
kernel: update 4.1 to 4.1.4
Changelog: * https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.4 Signed-off-by: Daniel Golle <daniel@makrotopia.org> [jogo: fix brcm2708 patches, refresh target patches] Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 46560
Diffstat (limited to 'target/linux/mxs/patches-4.1/103-dt-enable-regulator.patch')
-rw-r--r--target/linux/mxs/patches-4.1/103-dt-enable-regulator.patch4
1 files changed, 0 insertions, 4 deletions
diff --git a/target/linux/mxs/patches-4.1/103-dt-enable-regulator.patch b/target/linux/mxs/patches-4.1/103-dt-enable-regulator.patch
index 3fed18257d..bfcf247f85 100644
--- a/target/linux/mxs/patches-4.1/103-dt-enable-regulator.patch
+++ b/target/linux/mxs/patches-4.1/103-dt-enable-regulator.patch
@@ -1,5 +1,3 @@
-diff --git a/arch/arm/boot/dts/imx23.dtsi b/arch/arm/boot/dts/imx23.dtsi
-index bbcfb5a..efdd702 100644
--- a/arch/arm/boot/dts/imx23.dtsi
+++ b/arch/arm/boot/dts/imx23.dtsi
@@ -404,8 +404,46 @@
@@ -50,8 +48,6 @@ index bbcfb5a..efdd702 100644
};
saif1: saif@80046000 {
-diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
-index 25e25f8..378b1f2 100644
--- a/arch/arm/boot/dts/imx28.dtsi
+++ b/arch/arm/boot/dts/imx28.dtsi
@@ -1035,8 +1035,46 @@