diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-01-25 09:40:34 +1100 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-01-25 09:40:34 +1100 |
commit | 407a362f944a6667fe048db60c04b33b61cd4e86 (patch) | |
tree | 94c8b3de88918dc3bb1043172b50c49d45d5f06d /arch/powerpc/boot/dts/fsl/p1010si-post.dtsi | |
parent | 4a7cbb56fdbd92a47f57ca8b25bf5db35f0d6518 (diff) | |
parent | 621c4b999e3e1dc6f72b0c1680029981edc03caa (diff) |
Merge remote-tracking branch 'kumar/merge' into merge
Diffstat (limited to 'arch/powerpc/boot/dts/fsl/p1010si-post.dtsi')
-rw-r--r-- | arch/powerpc/boot/dts/fsl/p1010si-post.dtsi | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/boot/dts/fsl/p1010si-post.dtsi b/arch/powerpc/boot/dts/fsl/p1010si-post.dtsi index bd9e163c764..a97d1263372 100644 --- a/arch/powerpc/boot/dts/fsl/p1010si-post.dtsi +++ b/arch/powerpc/boot/dts/fsl/p1010si-post.dtsi @@ -158,7 +158,8 @@ /include/ "pq3-usb2-dr-0.dtsi" /include/ "pq3-esdhc-0.dtsi" sdhc@2e000 { - fsl,sdhci-auto-cmd12; + compatible = "fsl,p1010-esdhc", "fsl,esdhc"; + sdhci,auto-cmd12; }; /include/ "pq3-sec4.4-0.dtsi" |