From c886c53e15e01e7c6e45d1203843ac62f416cacf Mon Sep 17 00:00:00 2001
From: Shawn Guo <shawn.guo@linaro.org>
Date: Sun, 6 May 2012 10:04:23 +0800
Subject: [PATCH] --- yaml --- r: 308326 b: refs/heads/master c:
 81f38ee8e6a9472193337da248c30963a9741a30 h: refs/heads/master v: v3

---
 [refs]                                                     | 2 +-
 trunk/arch/arm/mach-mxs/include/mach/devices-common.h      | 2 +-
 trunk/drivers/mmc/host/mxs-mmc.c                           | 3 +--
 .../include/mach/mmc.h => include/linux/mmc/mxs-mmc.h}     | 7 ++++---
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename trunk/{arch/arm/mach-mxs/include/mach/mmc.h => include/linux/mmc/mxs-mmc.h} (81%)

diff --git a/[refs] b/[refs]
index 0d2f9168a8b8..e8065592352b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef9b4d3996624f65ffa928bd7767f0e186687c15
+refs/heads/master: 81f38ee8e6a9472193337da248c30963a9741a30
diff --git a/trunk/arch/arm/mach-mxs/include/mach/devices-common.h b/trunk/arch/arm/mach-mxs/include/mach/devices-common.h
index 2b37689c74ee..6fc060151979 100644
--- a/trunk/arch/arm/mach-mxs/include/mach/devices-common.h
+++ b/trunk/arch/arm/mach-mxs/include/mach/devices-common.h
@@ -87,7 +87,7 @@ struct platform_device * __init mxs_add_mxs_i2c(
 		const struct mxs_mxs_i2c_data *data);
 
 /* mmc */
-#include <mach/mmc.h>
+#include <linux/mmc/mxs-mmc.h>
 struct mxs_mxs_mmc_data {
 	const char *devid;
 	int id;
diff --git a/trunk/drivers/mmc/host/mxs-mmc.c b/trunk/drivers/mmc/host/mxs-mmc.c
index 92395563cd82..5343190bb9d9 100644
--- a/trunk/drivers/mmc/host/mxs-mmc.c
+++ b/trunk/drivers/mmc/host/mxs-mmc.c
@@ -41,8 +41,7 @@
 #include <linux/fsl/mxs-dma.h>
 #include <linux/pinctrl/consumer.h>
 #include <linux/stmp_device.h>
-
-#include <mach/mmc.h>
+#include <linux/mmc/mxs-mmc.h>
 
 #define DRIVER_NAME	"mxs-mmc"
 
diff --git a/trunk/arch/arm/mach-mxs/include/mach/mmc.h b/trunk/include/linux/mmc/mxs-mmc.h
similarity index 81%
rename from trunk/arch/arm/mach-mxs/include/mach/mmc.h
rename to trunk/include/linux/mmc/mxs-mmc.h
index 211547a05564..7c2ad3a7f2f3 100644
--- a/trunk/arch/arm/mach-mxs/include/mach/mmc.h
+++ b/trunk/include/linux/mmc/mxs-mmc.h
@@ -6,8 +6,8 @@
  * published by the Free Software Foundation.
  */
 
-#ifndef __MACH_MXS_MMC_H__
-#define __MACH_MXS_MMC_H__
+#ifndef __LINUX_MMC_MXS_MMC_H__
+#define __LINUX_MMC_MXS_MMC_H__
 
 struct mxs_mmc_platform_data {
 	int wp_gpio;	/* write protect pin */
@@ -15,4 +15,5 @@ struct mxs_mmc_platform_data {
 #define SLOTF_4_BIT_CAPABLE	(1 << 0)
 #define SLOTF_8_BIT_CAPABLE	(1 << 1)
 };
-#endif /* __MACH_MXS_MMC_H__ */
+
+#endif /* __LINUX_MMC_MXS_MMC_H__ */