On Sun, Sep 26, 2010 at 06:53:59AM -0400, zhangfei gao wrote: > From 29b0255431e3d635ae32214b223daef823433885 Mon Sep 17 00:00:00 2001 > From: Zhangfei Gao <[email protected]> > Date: Sun, 26 Sep 2010 18:32:27 -0400 > Subject: [PATCH 1/2] sdhci-pltfm: add sdhci-pxa > > Signed-off-by: Zhangfei Gao <[email protected]>
Should be merged into the other patch IMHO.
> ---
> drivers/mmc/host/sdhci-pltfm.c | 3 +++
> drivers/mmc/host/sdhci-pltfm.h | 1 +
> 2 files changed, 4 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-pltfm.c b/drivers/mmc/host/sdhci-pltfm.c
> index e06f047..7511fb7 100644
> --- a/drivers/mmc/host/sdhci-pltfm.c
> +++ b/drivers/mmc/host/sdhci-pltfm.c
> @@ -173,6 +173,9 @@ static const struct platform_device_id sdhci_pltfm_ids[]
> = {
> #ifdef CONFIG_MMC_SDHCI_CNS3XXX
> { "sdhci-cns3xxx", (kernel_ulong_t)&sdhci_cns3xxx_pdata },
> #endif
> +#ifdef CONFIG_MMC_SDHCI_PXA
> + { "sdhci-pxa", (kernel_ulong_t)&sdhci_pxa_pdata },
> +#endif
> { },
> };
> MODULE_DEVICE_TABLE(platform, sdhci_pltfm_ids);
> diff --git a/drivers/mmc/host/sdhci-pltfm.h b/drivers/mmc/host/sdhci-pltfm.h
> index 900f329..0747f42 100644
> --- a/drivers/mmc/host/sdhci-pltfm.h
> +++ b/drivers/mmc/host/sdhci-pltfm.h
> @@ -14,5 +14,6 @@
> #include <linux/sdhci-pltfm.h>
>
> extern struct sdhci_pltfm_data sdhci_cns3xxx_pdata;
> +extern struct sdhci_pltfm_data sdhci_pxa_pdata;
>
> #endif /* _DRIVERS_MMC_SDHCI_PLTFM_H */
> --
> 1.7.0.4
> From 29b0255431e3d635ae32214b223daef823433885 Mon Sep 17 00:00:00 2001
> From: Zhangfei Gao <[email protected]>
> Date: Sun, 26 Sep 2010 18:32:27 -0400
> Subject: [PATCH 1/2] sdhci-pltfm: add sdhci-pxa
>
> Signed-off-by: Zhangfei Gao <[email protected]>
> ---
> drivers/mmc/host/sdhci-pltfm.c | 3 +++
> drivers/mmc/host/sdhci-pltfm.h | 1 +
> 2 files changed, 4 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-pltfm.c b/drivers/mmc/host/sdhci-pltfm.c
> index e06f047..7511fb7 100644
> --- a/drivers/mmc/host/sdhci-pltfm.c
> +++ b/drivers/mmc/host/sdhci-pltfm.c
> @@ -173,6 +173,9 @@ static const struct platform_device_id sdhci_pltfm_ids[]
> = {
> #ifdef CONFIG_MMC_SDHCI_CNS3XXX
> { "sdhci-cns3xxx", (kernel_ulong_t)&sdhci_cns3xxx_pdata },
> #endif
> +#ifdef CONFIG_MMC_SDHCI_PXA
> + { "sdhci-pxa", (kernel_ulong_t)&sdhci_pxa_pdata },
> +#endif
> { },
> };
> MODULE_DEVICE_TABLE(platform, sdhci_pltfm_ids);
> diff --git a/drivers/mmc/host/sdhci-pltfm.h b/drivers/mmc/host/sdhci-pltfm.h
> index 900f329..0747f42 100644
> --- a/drivers/mmc/host/sdhci-pltfm.h
> +++ b/drivers/mmc/host/sdhci-pltfm.h
> @@ -14,5 +14,6 @@
> #include <linux/sdhci-pltfm.h>
>
> extern struct sdhci_pltfm_data sdhci_cns3xxx_pdata;
> +extern struct sdhci_pltfm_data sdhci_pxa_pdata;
>
> #endif /* _DRIVERS_MMC_SDHCI_PLTFM_H */
> --
> 1.7.0.4
>
--
Pengutronix e.K. | Wolfram Sang |
Industrial Linux Solutions | http://www.pengutronix.de/ |
signature.asc
Description: Digital signature
