From: Shawn Guo <shawn.guo@linaro.org>
To: linux-mmc@vger.kernel.org
Cc: Chris Ball <cjb@laptop.org>,
sameo@linux.intel.com, Arnd Bergmann <arnd@arndb.de>,
patches@linaro.org, Shawn Guo <shawn.guo@linaro.org>,
devicetree-discuss@lists.ozlabs.org,
Saeed Bishara <saeed@marvell.com>,
Xiaobo Xie <X.Xie@freescale.com>,
kernel@pengutronix.de, Mike Rapoport <mike@compulab.co.il>,
Olof Johansson <olof@lixom.net>,
Anton Vorontsov <avorontsov@ru.mvista.com>,
linuxppc-dev@lists.ozlabs.org,
Albert Herranz <albert_herranz@yahoo.es>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 7/7] ARM: mxc: remove esdhc.h and use the public one
Date: Thu, 5 May 2011 21:22:58 +0800 [thread overview]
Message-ID: <1304601778-13837-8-git-send-email-shawn.guo@linaro.org> (raw)
In-Reply-To: <1304601778-13837-1-git-send-email-shawn.guo@linaro.org>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
.../plat-mxc/devices/platform-sdhci-esdhc-imx.c | 1 -
arch/arm/plat-mxc/include/mach/devices-common.h | 2 +-
2 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/arch/arm/plat-mxc/devices/platform-sdhci-esdhc-imx.c b/arch/arm/plat-mxc/devices/platform-sdhci-esdhc-imx.c
index 6b2940b..b401689 100644
--- a/arch/arm/plat-mxc/devices/platform-sdhci-esdhc-imx.c
+++ b/arch/arm/plat-mxc/devices/platform-sdhci-esdhc-imx.c
@@ -8,7 +8,6 @@
#include <mach/hardware.h>
#include <mach/devices-common.h>
-#include <mach/esdhc.h>
#define imx_sdhci_esdhc_imx_data_entry_single(soc, _id, hwid) \
{ \
diff --git a/arch/arm/plat-mxc/include/mach/devices-common.h b/arch/arm/plat-mxc/include/mach/devices-common.h
index 8658c9c..c95ab13 100644
--- a/arch/arm/plat-mxc/include/mach/devices-common.h
+++ b/arch/arm/plat-mxc/include/mach/devices-common.h
@@ -243,7 +243,7 @@ struct imx_mxc_w1_data {
struct platform_device *__init imx_add_mxc_w1(
const struct imx_mxc_w1_data *data);
-#include <mach/esdhc.h>
+#include <linux/mmc/esdhc.h>
struct imx_sdhci_esdhc_imx_data {
int id;
resource_size_t iobase;
--
1.7.4.1
next prev parent reply other threads:[~2011-05-05 13:22 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-05 13:22 [PATCH v2 0/7] Consolidate sdhci pltfm & OF drivers and get them self registered Shawn Guo
2011-05-05 13:22 ` [PATCH v2 1/7] mmc: sdhci: make sdhci-pltfm device drivers " Shawn Guo
2011-05-05 14:24 ` Anton Vorontsov
2011-05-05 13:22 ` [PATCH v2 2/7] mmc: sdhci: eliminate sdhci_of_host and sdhci_of_data Shawn Guo
2011-05-05 14:23 ` Anton Vorontsov
2011-05-24 19:26 ` Wolfram Sang
2011-05-05 13:22 ` [PATCH v2 3/7] mmc: sdhci: make sdhci-of device drivers self registered Shawn Guo
2011-05-05 14:23 ` Anton Vorontsov
2011-05-06 2:15 ` Shawn Guo
2011-05-24 19:32 ` Wolfram Sang
2011-05-05 13:22 ` [PATCH v2 4/7] sdhci: rename sdhci-esdhc-imx.c to sdhci-esdhc.c Shawn Guo
2011-05-05 13:22 ` [PATCH v2 5/7] mmc: sdhci: consolidate sdhci-of-esdhc and sdhci-esdhc-imx Shawn Guo
2011-05-05 14:20 ` Anton Vorontsov
2011-05-19 9:48 ` Wolfram Sang
2011-05-24 19:40 ` Wolfram Sang
2011-05-25 6:06 ` Shawn Guo
2011-05-25 6:46 ` Uwe Kleine-König
2011-05-25 9:36 ` Shawn Guo
2011-05-05 13:22 ` [PATCH v2 6/7] mmc: sdhci: merge two sdhci-pltfm.h into one Shawn Guo
2011-05-05 14:13 ` Anton Vorontsov
2011-05-05 13:22 ` Shawn Guo [this message]
2011-05-06 8:39 ` [PATCH v2 7/7] ARM: mxc: remove esdhc.h and use the public one Uwe Kleine-König
2011-05-09 6:23 ` Shawn Guo
2011-05-19 9:40 ` [PATCH v2 0/7] Consolidate sdhci pltfm & OF drivers and get them self registered Wolfram Sang
2011-05-19 16:09 ` Shawn Guo
2011-05-19 17:05 ` Wolfram Sang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1304601778-13837-8-git-send-email-shawn.guo@linaro.org \
--to=shawn.guo@linaro.org \
--cc=X.Xie@freescale.com \
--cc=albert_herranz@yahoo.es \
--cc=arnd@arndb.de \
--cc=avorontsov@ru.mvista.com \
--cc=cjb@laptop.org \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mike@compulab.co.il \
--cc=olof@lixom.net \
--cc=patches@linaro.org \
--cc=saeed@marvell.com \
--cc=sameo@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).