diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-05-07 13:39:22 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-05-07 13:39:22 +0200 |
| commit | 37b16beaa92860c378273ccdcc2ccb22c6cee047 (patch) | |
| tree | 4fc7f879c32d11d318f411dbe128d080ed8478f9 /arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | |
| parent | 3e46d21285577a8c9e4c37f9b1002e567c440b28 (diff) | |
| parent | a4b4f11b2783ec678cccb4ce7e4ce9665aa04a24 (diff) | |
| download | talos-obmc-linux-37b16beaa92860c378273ccdcc2ccb22c6cee047.tar.gz talos-obmc-linux-37b16beaa92860c378273ccdcc2ccb22c6cee047.zip | |
Merge branch 'perf/urgent' into perf/core, to avoid conflicts
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/boot/dts/imx6qdl-gw52xx.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi index 8e99c9a9bc76..035d3a85c318 100644 --- a/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi +++ b/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi @@ -436,9 +436,6 @@ &ldb { status = "okay"; - lvds-channel@0 { - crtcs = <&ipu1 0>, <&ipu1 1>; - }; }; &pcie { |
