diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-11-10 21:10:34 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-11-10 21:10:34 -0500 |
| commit | 774facda20d2f8f0f61fa312d8028dad18ac5ee4 (patch) | |
| tree | a9068b769fa5956beaabc2445ebe1d575585d7d3 /drivers/mmc | |
| parent | b419148e567728f6af0c3b01965c1cc141e3e13a (diff) | |
| parent | ce491cf85466c3377228c5a852ea627ec5136956 (diff) | |
Merge branch '7xx-iosplit-plat' with omap-fixes
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/omap.c | 10 | ||||
| -rw-r--r-- | drivers/mmc/host/omap_hsmmc.c | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c index e7a331de5733..5d773b89af7c 100644 --- a/drivers/mmc/host/omap.c +++ b/drivers/mmc/host/omap.c | |||
| @@ -30,12 +30,12 @@ | |||
| 30 | #include <asm/io.h> | 30 | #include <asm/io.h> |
| 31 | #include <asm/irq.h> | 31 | #include <asm/irq.h> |
| 32 | 32 | ||
| 33 | #include <mach/board.h> | 33 | #include <plat/board.h> |
| 34 | #include <mach/mmc.h> | 34 | #include <plat/mmc.h> |
| 35 | #include <mach/gpio.h> | 35 | #include <mach/gpio.h> |
| 36 | #include <mach/dma.h> | 36 | #include <plat/dma.h> |
| 37 | #include <mach/mux.h> | 37 | #include <plat/mux.h> |
| 38 | #include <mach/fpga.h> | 38 | #include <plat/fpga.h> |
| 39 | 39 | ||
| 40 | #define OMAP_MMC_REG_CMD 0x00 | 40 | #define OMAP_MMC_REG_CMD 0x00 |
| 41 | #define OMAP_MMC_REG_ARGL 0x04 | 41 | #define OMAP_MMC_REG_ARGL 0x04 |
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index 0aecaaebef3d..4b2322518909 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c | |||
| @@ -30,11 +30,11 @@ | |||
| 30 | #include <linux/mmc/core.h> | 30 | #include <linux/mmc/core.h> |
| 31 | #include <linux/io.h> | 31 | #include <linux/io.h> |
| 32 | #include <linux/semaphore.h> | 32 | #include <linux/semaphore.h> |
| 33 | #include <mach/dma.h> | 33 | #include <plat/dma.h> |
| 34 | #include <mach/hardware.h> | 34 | #include <mach/hardware.h> |
| 35 | #include <mach/board.h> | 35 | #include <plat/board.h> |
| 36 | #include <mach/mmc.h> | 36 | #include <plat/mmc.h> |
| 37 | #include <mach/cpu.h> | 37 | #include <plat/cpu.h> |
| 38 | 38 | ||
| 39 | /* OMAP HSMMC Host Controller Registers */ | 39 | /* OMAP HSMMC Host Controller Registers */ |
| 40 | #define OMAP_HSMMC_SYSCONFIG 0x0010 | 40 | #define OMAP_HSMMC_SYSCONFIG 0x0010 |