Merge branch 'work.compat' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / exynos5800-peach-pi.dts

diff --git a/arch/arm/boot/dts/exynos5800-peach-pi.dts b/arch/arm/boot/dts/exynos5800-peach-pi.dts
index 2f8df9244f72f879cefcf27cf968677fe33c6ef9..d80ab9085da19330b877643345e24cb50439d89c 100644 (file)
--- a/arch/arm/boot/dts/exynos5800-peach-pi.dts
+++ b/arch/arm/boot/dts/exynos5800-peach-pi.dts
@@ -27,7 +27,7 @@
 
        aliases {
                /* Assign 20 so we don't get confused w/ builtin ones */
-               i2c20 = "/spi@12d40000/cros-ec@0/i2c-tunnel";
+               i2c20 = &i2c_tunnel;
        };
 
        backlight: backlight {
@@ -939,7 +939,7 @@
                        samsung,spi-feedback-delay = <1>;
                };
 
-               i2c-tunnel {
+               i2c_tunnel: i2c-tunnel {
                        compatible = "google,cros-ec-i2c-tunnel";
                        #address-cells = <1>;
                        #size-cells = <0>;