diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-11-09 17:54:17 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-11-09 17:54:17 -0500 |
| commit | f56f52e02a9c3da4bc2cc6eb9ddcf5602ea44b37 (patch) | |
| tree | a9ce4f46ea3b2e516698b2c3817e40414a8bbf51 /drivers/mmc/host/omap_hsmmc.c | |
| parent | 84fbd2b8c8da49b4e53fcb484a1564a9b5da61b3 (diff) | |
| parent | 6ba54ab4a49bbad736b0254aa6bdf0cb83013815 (diff) | |
Merge branch 'omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3' into omap-for-v3.8/dt
Conflicts:
arch/arm/plat-omap/dmtimer.c
Resolved as suggested by Jon Hunter.
Diffstat (limited to 'drivers/mmc/host/omap_hsmmc.c')
| -rw-r--r-- | drivers/mmc/host/omap_hsmmc.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index 54bfd0cc106b..9b24bd46aad3 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c | |||
| @@ -38,9 +38,7 @@ | |||
| 38 | #include <linux/gpio.h> | 38 | #include <linux/gpio.h> |
| 39 | #include <linux/regulator/consumer.h> | 39 | #include <linux/regulator/consumer.h> |
| 40 | #include <linux/pm_runtime.h> | 40 | #include <linux/pm_runtime.h> |
| 41 | #include <mach/hardware.h> | 41 | #include <linux/platform_data/mmc-omap.h> |
| 42 | #include <plat/mmc.h> | ||
| 43 | #include <plat/cpu.h> | ||
| 44 | 42 | ||
| 45 | /* OMAP HSMMC Host Controller Registers */ | 43 | /* OMAP HSMMC Host Controller Registers */ |
| 46 | #define OMAP_HSMMC_SYSSTATUS 0x0014 | 44 | #define OMAP_HSMMC_SYSSTATUS 0x0014 |