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

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / spear1310-evb.dts

diff --git a/arch/arm/boot/dts/spear1310-evb.dts b/arch/arm/boot/dts/spear1310-evb.dts
index 84101e4eebbf88bc9e112627b1abb6345e2d7e80..0f5f379323a8e5d75fe1e3b5d6df924eab8f685c 100644 (file)
--- a/arch/arm/boot/dts/spear1310-evb.dts
+++ b/arch/arm/boot/dts/spear1310-evb.dts
@@ -349,7 +349,7 @@
                        spi0: spi@e0100000 {
                                status = "okay";
                                num-cs = <3>;
-                               cs-gpios = <&gpio1 7 0>, <&spics 0>, <&spics 1>;
+                               cs-gpios = <&gpio1 7 0>, <&spics 0 0>, <&spics 1 0>;
 
                                stmpe610@0 {
                                        compatible = "st,stmpe610";