Hello Andreas, On 02/18/2015 05:10 PM, Andreas Färber wrote: > Resolve a merge conflict with mmc refactoring aaa25a5a33cb ("ARM: dts: > unuse the slot-node and deprecate the supports-highspeed for dw-mmc in > exynos") by dropping the slot@0 nodes, moving its bus-width property to > the mmc node and replacing supports-highspeed with cap-{mmc,sd}-highspeed, > matching exynos5250-snow. > > Cc: Jaehoon Chung <jh80.ch...@samsung.com> > Fixes: 53dd4138bb0a ("ARM: dts: Add exynos5250-spring device tree") > Signed-off-by: Andreas Färber <afaer...@suse.de> > --- > arch/arm/boot/dts/exynos5250-spring.dts | 16 ++++------------ > 1 file changed, 4 insertions(+), 12 deletions(-) >
Reviewed-by: Javier Martinez Canillas <javier.marti...@collabora.co.uk> Best regards, Javier -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html