[PATCH 6.2/7] MMC: mmci: Enable Device Tree support for ux500

Chris Ball
2012-05-08T14:38:07Z

Hi,

On Tue, May 08 2012, Lee Jones wrote:
> Here you go Chris.
>
> From: Lee Jones <lee.jones@linaro.org>
> Date: Tue, 8 May 2012 13:40:02 +0100
> Subject: [PATCH] MMC: mmci: Fix compiler error when CONFIG_OF is not set
>
> error: implicit declaration of function 'mmci_dt_populate_generic_pdata'
>
> This is due to the '#if CONFIG_OF' guards placed around
> mmci_dt_populate_generic_pdata(), but not around the call to it. We
> repair this by inserting a stub which elegantly returns when CONFIG_OF
> is not set.
>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
> ---
> drivers/mmc/host/mmci.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
> index 2303a16..efc822d 100644
> --- a/drivers/mmc/host/mmci.c
> +++ b/drivers/mmc/host/mmci.c
> @@ -1241,6 +1241,12 @@ static void mmci_dt_populate_generic_pdata(struct device_node *np,
> pr_warn("%s: Unsupported bus width\n", np->full_name);
> }
> }
> +#else
> +static void mmci_dt_populate_generic_pdata(struct device_node *np,
> + struct mmci_platform_data *pdata)
> +{
> + return;
> +}
> #endif
>
> static int __devinit mmci_probe(struct amba_device *dev,

Thanks, this is in mmc-next now.

- Chris.
--
Chris Ball <cjb@laptop.org> <http://printf.net/>
One Laptop Per Child