diff options
| author | Daniel Lezcano <daniel.lezcano@linaro.org> | 2014-05-16 18:08:32 +0400 |
|---|---|---|
| committer | Daniel Lezcano <daniel.lezcano@linaro.org> | 2014-05-16 18:08:32 +0400 |
| commit | 3f04e3d3eb77ac9df70619b9c87da71b0eeddc36 (patch) | |
| tree | cf1cbadc390888d1910a81ffc40161f783363075 /arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | |
| parent | 8cffcb0ca33381e07cee4ebe1301d0794054fc97 (diff) | |
| parent | 2779ac167b1a1bf8153dca9f3a141c6148c6b89f (diff) | |
| download | linux-3f04e3d3eb77ac9df70619b9c87da71b0eeddc36.tar.xz | |
Merge remote-tracking branch 'tip/timers/core/timers/core' into clockevents/3.16
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 { |