]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
arm: soc: fix mismerge
authorOlof Johansson <olof@lixom.net>
Thu, 22 May 2014 04:58:23 +0000 (21:58 -0700)
committerOlof Johansson <olof@lixom.net>
Thu, 22 May 2014 04:58:23 +0000 (21:58 -0700)
Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/boot/dts/r8a7790-lager.dts

index cf12e59d0a7b382a0c6d011ef5804d97dc20e061..9becef78c797da3a72c1c0bc63ed2b6c745358a2 100644 (file)
                spi-cpol;
                spi-cpha;
        };
-}
+};
 
 &scif0 {
        pinctrl-0 = <&scif0_pins>;