diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-11-22 19:08:43 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-11-22 19:08:43 +0100 |
| commit | a76df42a675c9936e8bf3607226e74c8a5e2d847 (patch) | |
| tree | 96d93706d884dea956393653452fa4d78d8d7f76 /drivers/mmc/host | |
| parent | Linux 2.6.32-rc8 (diff) | |
| parent | Merge branch 'pm-upstream/pm-cpuidle' of ssh://master.kernel.org/pub/scm/linu... (diff) | |
| download | linux-a76df42a675c9936e8bf3607226e74c8a5e2d847.tar.xz linux-a76df42a675c9936e8bf3607226e74c8a5e2d847.zip | |
Merge 7xx-iosplit-plat-merge with omap-fixes
Merge branch '7xx-iosplit-plat-merge' into omap-for-linus
Diffstat (limited to 'drivers/mmc/host')
| -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 b8fd7af1ceeb..5f970e253e50 100644 --- a/drivers/mmc/host/omap.c +++ b/drivers/mmc/host/omap.c @@ -30,12 +30,12 @@ #include <asm/io.h> #include <asm/irq.h> -#include <mach/board.h> -#include <mach/mmc.h> +#include <plat/board.h> +#include <plat/mmc.h> #include <mach/gpio.h> -#include <mach/dma.h> -#include <mach/mux.h> -#include <mach/fpga.h> +#include <plat/dma.h> +#include <plat/mux.h> +#include <plat/fpga.h> #define OMAP_MMC_REG_CMD 0x00 #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 @@ #include <linux/mmc/core.h> #include <linux/io.h> #include <linux/semaphore.h> -#include <mach/dma.h> +#include <plat/dma.h> #include <mach/hardware.h> -#include <mach/board.h> -#include <mach/mmc.h> -#include <mach/cpu.h> +#include <plat/board.h> +#include <plat/mmc.h> +#include <plat/cpu.h> /* OMAP HSMMC Host Controller Registers */ #define OMAP_HSMMC_SYSCONFIG 0x0010 |