diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-11-22 13:08:43 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-11-22 13:08:43 -0500 |
| commit | a76df42a675c9936e8bf3607226e74c8a5e2d847 (patch) | |
| tree | 96d93706d884dea956393653452fa4d78d8d7f76 /drivers/mmc/host/omap.c | |
| parent | 648f4e3e50c4793d9dbf9a09afa193631f76fa26 (diff) | |
| parent | 8171d88089ad63fc442b2bf32af7c18653adc5cb (diff) | |
Merge 7xx-iosplit-plat-merge with omap-fixes
Merge branch '7xx-iosplit-plat-merge' into omap-for-linus
Diffstat (limited to 'drivers/mmc/host/omap.c')
| -rw-r--r-- | drivers/mmc/host/omap.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c index b8fd7af1ceeb..5f970e253e50 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 |