git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '7xx-iosplit-plat' with omap-fixes
[safe/jmp/linux-2.6]
/
drivers
/
mmc
/
host
/
omap_hsmmc.c
diff --git
a/drivers/mmc/host/omap_hsmmc.c
b/drivers/mmc/host/omap_hsmmc.c
index
0aecaae
..
4b23225
100644
(file)
--- 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 <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/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
/* OMAP HSMMC Host Controller Registers */
#define OMAP_HSMMC_SYSCONFIG 0x0010