Merge branch 'ras-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / am57xx-beagle-x15-common.dtsi

diff --git a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
index 6204a266212a2516183d2d33b6898be81bd09f92..ad953113cefbda10f32bf03c6b11e0551dad8834 100644 (file)
--- a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
+++ b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
@@ -444,8 +444,8 @@
        vmmc-supply = <&vdd_3v3>;
        vqmmc-supply = <&vdd_3v3>;
        bus-width = <8>;
-       ti,non-removable;
-       cap-mmc-dual-data-rate;
+       non-removable;
+       no-1-8-v;
 };
 
 &sata {