diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2012-05-05 22:04:23 -0400 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2012-05-12 20:05:38 -0400 |
commit | 81f38ee8e6a9472193337da248c30963a9741a30 (patch) | |
tree | 780402d73099f698fc59b225109aff219c7a56b1 /arch/arm/mach-mxs | |
parent | ef9b4d3996624f65ffa928bd7767f0e186687c15 (diff) |
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')
-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( | |||
87 | const struct mxs_mxs_i2c_data *data); | 87 | const struct mxs_mxs_i2c_data *data); |
88 | 88 | ||
89 | /* mmc */ | 89 | /* mmc */ |
90 | #include <mach/mmc.h> | 90 | #include <linux/mmc/mxs-mmc.h> |
91 | struct mxs_mxs_mmc_data { | 91 | struct mxs_mxs_mmc_data { |
92 | const char *devid; | 92 | const char *devid; |
93 | int id; | 93 | 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 @@ | |||
1 | /* | ||
2 | * Copyright 2011 Freescale Semiconductor, Inc. All Rights Reserved. | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify | ||
5 | * it under the terms of the GNU General Public License version 2 as | ||
6 | * published by the Free Software Foundation. | ||
7 | */ | ||
8 | |||
9 | #ifndef __MACH_MXS_MMC_H__ | ||
10 | #define __MACH_MXS_MMC_H__ | ||
11 | |||
12 | struct mxs_mmc_platform_data { | ||
13 | int wp_gpio; /* write protect pin */ | ||
14 | unsigned int flags; | ||
15 | #define SLOTF_4_BIT_CAPABLE (1 << 0) | ||
16 | #define SLOTF_8_BIT_CAPABLE (1 << 1) | ||
17 | }; | ||
18 | #endif /* __MACH_MXS_MMC_H__ */ | ||