aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/imx6/patches-3.12/0009-imx-add-PCI-fixup-for-PEX860X-on-Gateworks-board.patch
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2013-10-30 23:31:26 +0000
committerLuka Perkov <luka@openwrt.org>2013-10-30 23:31:26 +0000
commit57e70c1cc295de722f293872f89aedb1d94009b0 (patch)
tree37b2e3aba160fb9666c7c38adefecef90b795f68 /target/linux/imx6/patches-3.12/0009-imx-add-PCI-fixup-for-PEX860X-on-Gateworks-board.patch
parent4f7c503fd00e256d051f9f398fff298eabed3967 (diff)
downloadmaster-187ad058-57e70c1cc295de722f293872f89aedb1d94009b0.tar.gz
master-187ad058-57e70c1cc295de722f293872f89aedb1d94009b0.tar.bz2
master-187ad058-57e70c1cc295de722f293872f89aedb1d94009b0.zip
imx6: update patches
Changes include PCI fixes and various upstream pending patches. Signed-off-by: Luka Perkov <luka@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38624 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/imx6/patches-3.12/0009-imx-add-PCI-fixup-for-PEX860X-on-Gateworks-board.patch')
-rw-r--r--target/linux/imx6/patches-3.12/0009-imx-add-PCI-fixup-for-PEX860X-on-Gateworks-board.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/imx6/patches-3.12/0009-imx-add-PCI-fixup-for-PEX860X-on-Gateworks-board.patch b/target/linux/imx6/patches-3.12/0009-imx-add-PCI-fixup-for-PEX860X-on-Gateworks-board.patch
index c5b7bbef5e..4ac15ca05b 100644
--- a/target/linux/imx6/patches-3.12/0009-imx-add-PCI-fixup-for-PEX860X-on-Gateworks-board.patch
+++ b/target/linux/imx6/patches-3.12/0009-imx-add-PCI-fixup-for-PEX860X-on-Gateworks-board.patch
@@ -15,7 +15,7 @@ Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
--- a/arch/arm/mach-imx/mach-imx6q.c
+++ b/arch/arm/mach-imx/mach-imx6q.c
-@@ -23,6 +24,7 @@
+@@ -26,6 +26,7 @@
#include <linux/of_irq.h>
#include <linux/of_platform.h>
#include <linux/opp.h>
@@ -23,7 +23,7 @@ Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
#include <linux/phy.h>
#include <linux/reboot.h>
#include <linux/regmap.h>
-@@ -78,6 +80,34 @@ static int ksz9031rn_phy_fixup(struct phy_device *dev)
+@@ -134,6 +135,34 @@ static int ksz9031rn_phy_fixup(struct ph
return 0;
}