Skip to content

Commit

Permalink
mmc: mxs-mmc: move header from mach into linux folder
Browse files Browse the repository at this point in the history
Rename arch/arm/mach-mxs/include/mach/mmc.h to
include/linux/mmc/mxs-mmc.h, so that mxs-mmc driver becomes
<mach/*> inclusion free.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Marek Vasut <marex@denx.de>
Acked-by: Chris Ball <cjb@laptop.org>
  • Loading branch information
Shawn Guo committed May 13, 2012
1 parent ef9b4d3 commit 81f38ee
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion arch/arm/mach-mxs/include/mach/devices-common.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions drivers/mmc/host/mxs-mmc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@
* 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 */
unsigned int flags;
#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__ */

0 comments on commit 81f38ee

Please sign in to comment.