aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/imx6/patches-3.12/0010-ARM-imx6q-Add-PCIe-bits-to-GPR-syscon-definition.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/0010-ARM-imx6q-Add-PCIe-bits-to-GPR-syscon-definition.patch
parent4f7c503fd00e256d051f9f398fff298eabed3967 (diff)
downloadupstream-57e70c1cc295de722f293872f89aedb1d94009b0.tar.gz
upstream-57e70c1cc295de722f293872f89aedb1d94009b0.tar.bz2
upstream-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/0010-ARM-imx6q-Add-PCIe-bits-to-GPR-syscon-definition.patch')
-rw-r--r--target/linux/imx6/patches-3.12/0010-ARM-imx6q-Add-PCIe-bits-to-GPR-syscon-definition.patch5
1 files changed, 0 insertions, 5 deletions
diff --git a/target/linux/imx6/patches-3.12/0010-ARM-imx6q-Add-PCIe-bits-to-GPR-syscon-definition.patch b/target/linux/imx6/patches-3.12/0010-ARM-imx6q-Add-PCIe-bits-to-GPR-syscon-definition.patch
index c8e4db1f89..3dce8d9871 100644
--- a/target/linux/imx6/patches-3.12/0010-ARM-imx6q-Add-PCIe-bits-to-GPR-syscon-definition.patch
+++ b/target/linux/imx6/patches-3.12/0010-ARM-imx6q-Add-PCIe-bits-to-GPR-syscon-definition.patch
@@ -12,8 +12,6 @@ Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
include/linux/mfd/syscon/imx6q-iomuxc-gpr.h | 8 ++++++++
1 file changed, 8 insertions(+)
-diff --git a/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h b/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h
-index b6bdcd6..e00e9f3 100644
--- a/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h
+++ b/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h
@@ -241,6 +241,12 @@
@@ -39,6 +37,3 @@ index b6bdcd6..e00e9f3 100644
#define IMX6Q_GPR13_SDMA_STOP_REQ BIT(30)
#define IMX6Q_GPR13_CAN2_STOP_REQ BIT(29)
---
-1.8.4.1
-