Merge tag 'iwlwifi-next-for-kalle-2016-07-01' of git://git.kernel.org/pub/scm/linux...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / exynos5250-arndale.dts

diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts
index 8b2acc74aa76fac7bcf73d28ad653e7897f8f7ee..85dad29c08dc745028739efd45d2e6bfdf84b780 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-arndale.dts
+++ b/arch/arm/boot/dts/exynos5250-arndale.dts
@@ -124,8 +124,6 @@
 &dp {
        status = "okay";
        samsung,color-space = <0>;
-       samsung,dynamic-range = <0>;
-       samsung,ycbcr-coeff = <0>;
        samsung,color-depth = <1>;
        samsung,link-rate = <0x0a>;
        samsung,lane-count = <4>;
@@ -133,7 +131,7 @@
        display-timings {
                native-mode = <&timing0>;
 
-               timing0: timing@0 {
+               timing0: timing {
                        /* 2560x1600 DP panel */
                        clock-frequency = <50000>;
                        hactive = <2560>;