[PATCH 3/7] mmc: make the reference to sdhci_tegra_dt_pdata conditional

Grant Likely grant.likely at secretlab.ca
Tue Mar 15 18:58:59 EST 2011


On Mon, Mar 14, 2011 at 10:25:55PM +0800, Shawn Guo wrote:
> Wrap tegra dt_id with CONFIG_MMC_SDHCI_TEGRA to make the reference to
> sdhci_tegra_dt_pdata conditional, otherwise it will stop build for
> other mmc driver when OF is enabled.
> 
> Signed-off-by: Shawn Guo <shawn.guo at linaro.org>

Looks right to me.

g.

> ---
>  drivers/mmc/host/sdhci-pltfm.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/mmc/host/sdhci-pltfm.c b/drivers/mmc/host/sdhci-pltfm.c
> index ccc04ac..4125fbf 100644
> --- a/drivers/mmc/host/sdhci-pltfm.c
> +++ b/drivers/mmc/host/sdhci-pltfm.c
> @@ -52,7 +52,9 @@ static struct sdhci_ops sdhci_pltfm_ops = {
>  #if defined(CONFIG_OF)
>  #include <linux/of_device.h>
>  static const struct of_device_id sdhci_dt_ids[] = {
> +#ifdef CONFIG_MMC_SDHCI_TEGRA
>  	{ .compatible = "nvidia,tegra250-sdhci", .data = &sdhci_tegra_dt_pdata },
> +#endif
>  	{ }
>  };
>  MODULE_DEVICE_TABLE(platform, sdhci_dt_ids);
> -- 
> 1.7.1
> 


More information about the devicetree-discuss mailing list