Re: linux-next: build failure after merge of the mmc tree

[Stephen Rothwell]

Hi Shawn,

On Mon, 6 Jan 2014 14:44:08 +0800 Shawn Guo <shawn.guo@xxxxxxxxxx> wrote:
>
> Okay, I missed your point.  The resolution needs the additional changes
> as below.
> 
> Shawn
> 
> diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
> b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
> index 91e5dd4..8b05648 100644
> --- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
> @@ -356,6 +356,10 @@
>                 pinctrl_usdhc3: usdhc3grp {
>                         fsl,pins = <MX6QDL_USDHC3_PINGRP_D8>;
>                 };
> +
> +               pinctrl_usdhc4: usdhc4grp {
> +                       fsl,pins = <MX6QDL_USDHC4_PINGRP_D8>;
> +               };
>         };
>  };

Thanks, I will add this as a merge resolution patch tomorrow.

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature