projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
arch
/
arm
/
mach-mxs
/
include
/
mach
/
devices-common.h
diff --git
a/arch/arm/mach-mxs/include/mach/devices-common.h
b/arch/arm/mach-mxs/include/mach/devices-common.h
index
21e45a7
..
e8b1d95
100644
(file)
--- a/
arch/arm/mach-mxs/include/mach/devices-common.h
+++ b/
arch/arm/mach-mxs/include/mach/devices-common.h
@@
-82,8
+82,9
@@
struct platform_device * __init mxs_add_mxs_i2c(
const struct mxs_mxs_i2c_data *data);
/* mmc */
-#include <
mach/
mmc.h>
+#include <
linux/mmc/mxs-
mmc.h>
struct mxs_mxs_mmc_data {
+ const char *devid;
int id;
resource_size_t iobase;
resource_size_t dma;