diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2011-05-27 23:48:15 +0800 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2011-07-20 17:20:48 -0400 |
| commit | 94cc6a86567cb3c2234807081a46ce5400c36b31 (patch) | |
| tree | 41d7253d5bc7f05a901277c3f2631ff2da31268b /drivers/mmc/host | |
| parent | 38576af1f8cad48446df47dcf404b197c9206dba (diff) | |
mmc: sdhci: merge two sdhci-pltfm.h into one
The structure sdhci_pltfm_data is not necessarily to be in a public
header like include/linux/mmc/sdhci-pltfm.h, so the patch moves it
into drivers/mmc/host/sdhci-pltfm.h and eliminates the former one.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Reviewed-by: Grant Likely <grant.likely@secretlab.ca>
Reviewed-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc/host')
| -rw-r--r-- | drivers/mmc/host/sdhci-cns3xxx.c | 1 | ||||
| -rw-r--r-- | drivers/mmc/host/sdhci-esdhc-imx.c | 1 | ||||
| -rw-r--r-- | drivers/mmc/host/sdhci-pltfm.h | 6 |
3 files changed, 5 insertions, 3 deletions
diff --git a/drivers/mmc/host/sdhci-cns3xxx.c b/drivers/mmc/host/sdhci-cns3xxx.c index ac4b26f555e..025d1a5ab96 100644 --- a/drivers/mmc/host/sdhci-cns3xxx.c +++ b/drivers/mmc/host/sdhci-cns3xxx.c @@ -15,7 +15,6 @@ #include <linux/delay.h> #include <linux/device.h> #include <linux/mmc/host.h> -#include <linux/mmc/sdhci-pltfm.h> #include <mach/cns3xxx.h> #include "sdhci.h" #include "sdhci-pltfm.h" diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index e27ccbb5285..977f1421ec2 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c @@ -18,7 +18,6 @@ #include <linux/gpio.h> #include <linux/slab.h> #include <linux/mmc/host.h> -#include <linux/mmc/sdhci-pltfm.h> #include <linux/mmc/mmc.h> #include <linux/mmc/sdio.h> #include <mach/hardware.h> diff --git a/drivers/mmc/host/sdhci-pltfm.h b/drivers/mmc/host/sdhci-pltfm.h index fe27b83f5bb..fd726948641 100644 --- a/drivers/mmc/host/sdhci-pltfm.h +++ b/drivers/mmc/host/sdhci-pltfm.h @@ -14,9 +14,13 @@ #include <linux/clk.h> #include <linux/types.h> #include <linux/platform_device.h> -#include <linux/mmc/sdhci-pltfm.h> #include <linux/mmc/sdhci.h> +struct sdhci_pltfm_data { + struct sdhci_ops *ops; + unsigned int quirks; +}; + struct sdhci_pltfm_host { struct clk *clk; void *priv; /* to handle quirks across io-accessor calls */ |