git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into core/urgent
[pandora-kernel.git]
/
arch
/
arm
/
mach-imx
/
mach-mx25_3ds.c
diff --git
a/arch/arm/mach-imx/mach-mx25_3ds.c
b/arch/arm/mach-imx/mach-mx25_3ds.c
index
01534bb
..
7f66a91
100644
(file)
--- a/
arch/arm/mach-imx/mach-mx25_3ds.c
+++ b/
arch/arm/mach-imx/mach-mx25_3ds.c
@@
-215,6
+215,8
@@
static const struct imxi2c_platform_data mx25_3ds_i2c0_data __initconst = {
static const struct esdhc_platform_data mx25pdk_esdhc_pdata __initconst = {
.wp_gpio = SD1_GPIO_WP,
.cd_gpio = SD1_GPIO_CD,
+ .wp_type = ESDHC_WP_GPIO,
+ .cd_type = ESDHC_CD_GPIO,
};
static void __init mx25pdk_init(void)