diff options
| -rw-r--r-- | arch/arm/mach-mxs/include/mach/devices-common.h | 2 | ||||
| -rw-r--r-- | drivers/mmc/host/mxs-mmc.c | 3 | ||||
| -rw-r--r-- | include/linux/mmc/mxs-mmc.h (renamed from arch/arm/mach-mxs/include/mach/mmc.h) | 7 |
3 files changed, 6 insertions, 6 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/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c index 92395563cd82..5343190bb9d9 100644 --- a/drivers/mmc/host/mxs-mmc.c +++ b/drivers/mmc/host/mxs-mmc.c | |||
| @@ -41,8 +41,7 @@ | |||
| 41 | #include <linux/fsl/mxs-dma.h> | 41 | #include <linux/fsl/mxs-dma.h> |
| 42 | #include <linux/pinctrl/consumer.h> | 42 | #include <linux/pinctrl/consumer.h> |
| 43 | #include <linux/stmp_device.h> | 43 | #include <linux/stmp_device.h> |
| 44 | 44 | #include <linux/mmc/mxs-mmc.h> | |
| 45 | #include <mach/mmc.h> | ||
| 46 | 45 | ||
| 47 | #define DRIVER_NAME "mxs-mmc" | 46 | #define DRIVER_NAME "mxs-mmc" |
| 48 | 47 | ||
diff --git a/arch/arm/mach-mxs/include/mach/mmc.h b/include/linux/mmc/mxs-mmc.h index 211547a05564..7c2ad3a7f2f3 100644 --- a/arch/arm/mach-mxs/include/mach/mmc.h +++ b/include/linux/mmc/mxs-mmc.h | |||
| @@ -6,8 +6,8 @@ | |||
| 6 | * published by the Free Software Foundation. | 6 | * published by the Free Software Foundation. |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #ifndef __MACH_MXS_MMC_H__ | 9 | #ifndef __LINUX_MMC_MXS_MMC_H__ |
| 10 | #define __MACH_MXS_MMC_H__ | 10 | #define __LINUX_MMC_MXS_MMC_H__ |
| 11 | 11 | ||
| 12 | struct mxs_mmc_platform_data { | 12 | struct mxs_mmc_platform_data { |
| 13 | int wp_gpio; /* write protect pin */ | 13 | int wp_gpio; /* write protect pin */ |
| @@ -15,4 +15,5 @@ struct mxs_mmc_platform_data { | |||
| 15 | #define SLOTF_4_BIT_CAPABLE (1 << 0) | 15 | #define SLOTF_4_BIT_CAPABLE (1 << 0) |
| 16 | #define SLOTF_8_BIT_CAPABLE (1 << 1) | 16 | #define SLOTF_8_BIT_CAPABLE (1 << 1) |
| 17 | }; | 17 | }; |
| 18 | #endif /* __MACH_MXS_MMC_H__ */ | 18 | |
| 19 | #endif /* __LINUX_MMC_MXS_MMC_H__ */ | ||
