diff options
| author | Shawn Guo | 2012-05-06 04:04:23 +0200 |
|---|---|---|
| committer | Shawn Guo | 2012-05-13 02:05:38 +0200 |
| commit | 81f38ee8e6a9472193337da248c30963a9741a30 (patch) | |
| tree | 780402d73099f698fc59b225109aff219c7a56b1 /arch/arm/mach-mxs/include | |
| parent | mmc: mxs-mmc: get rid of the use of cpu_is_xxx (diff) | |
| download | kernel-qcow2-linux-81f38ee8e6a9472193337da248c30963a9741a30.tar.gz kernel-qcow2-linux-81f38ee8e6a9472193337da248c30963a9741a30.tar.xz kernel-qcow2-linux-81f38ee8e6a9472193337da248c30963a9741a30.zip | |
mmc: mxs-mmc: move header from mach into linux folder
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>
Diffstat (limited to 'arch/arm/mach-mxs/include')
| -rw-r--r-- | arch/arm/mach-mxs/include/mach/devices-common.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mxs/include/mach/mmc.h | 18 |
2 files changed, 1 insertions, 19 deletions
diff --git a/arch/arm/mach-mxs/include/mach/devices-common.h b/arch/arm/mach-mxs/include/mach/devices-common.h index 2b37689c74ee..6fc060151979 100644 --- a/arch/arm/mach-mxs/include/mach/devices-common.h +++ b/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/arch/arm/mach-mxs/include/mach/mmc.h b/arch/arm/mach-mxs/include/mach/mmc.h deleted file mode 100644 index 211547a05564..000000000000 --- a/arch/arm/mach-mxs/include/mach/mmc.h +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright 2011 Freescale Semiconductor, Inc. All Rights Reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - */ - -#ifndef __MACH_MXS_MMC_H__ -#define __MACH_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__ */ |