Merge branch 'ras-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / exynos4210-trats.dts

diff --git a/arch/arm/boot/dts/exynos4210-trats.dts b/arch/arm/boot/dts/exynos4210-trats.dts
index eaeeb4f6b84ab732570a1abf899c51d523023b68..6f1d76cb795157b9947a52e538a1aba8c1595ea7 100644 (file)
--- a/arch/arm/boot/dts/exynos4210-trats.dts
+++ b/arch/arm/boot/dts/exynos4210-trats.dts
@@ -259,8 +259,8 @@
                reg = <0x48>;
                interrupt-parent = <&gpx0>;
                interrupts = <4 IRQ_TYPE_EDGE_FALLING>;
-               x-size = <720>;
-               y-size = <1280>;
+               touchscreen-size-x = <720>;
+               touchscreen-size-y = <1280>;
                avdd-supply = <&tsp_reg>;
                vdd-supply = <&tsp_reg>;
        };