diff options
author | Olof Johansson <olof@lixom.net> | 2011-11-09 13:38:52 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2011-11-09 13:38:52 -0800 |
commit | 3c52b2be1804ed553df8df47213b58fedc93c5ab (patch) | |
tree | a0186a1012a49ae81bf6b69f4fdc00fb6a854003 /arch/arm/boot/dts/tegra-ventana.dts | |
parent | c30c8f9f167cb9b40ca9e755c0d32087a2d415ff (diff) | |
parent | 686448d7a253f9db836f4f44c6624461570e5026 (diff) | |
download | talos-op-linux-3c52b2be1804ed553df8df47213b58fedc93c5ab.tar.gz talos-op-linux-3c52b2be1804ed553df8df47213b58fedc93c5ab.zip |
Merge branch 'for-3.2/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra into fixes
Diffstat (limited to 'arch/arm/boot/dts/tegra-ventana.dts')
-rw-r--r-- | arch/arm/boot/dts/tegra-ventana.dts | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/tegra-ventana.dts b/arch/arm/boot/dts/tegra-ventana.dts index 9b29a623aaf1..3f9abd6b6964 100644 --- a/arch/arm/boot/dts/tegra-ventana.dts +++ b/arch/arm/boot/dts/tegra-ventana.dts @@ -22,11 +22,10 @@ sdhci@c8000400 { cd-gpios = <&gpio 69 0>; /* gpio PI5 */ wp-gpios = <&gpio 57 0>; /* gpio PH1 */ - power-gpios = <&gpio 155 0>; /* gpio PT3 */ + power-gpios = <&gpio 70 0>; /* gpio PI6 */ }; sdhci@c8000600 { - power-gpios = <&gpio 70 0>; /* gpio PI6 */ support-8bit; }; }; |