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 branches 'upstream-fixes' and 'magicmouse' into for-linus
[pandora-kernel.git]
/
arch
/
arm
/
mach-imx
/
eukrea_mbimxsd25-baseboard.c
diff --git
a/arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c
b/arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c
index
01ebcb3
..
66e8726
100644
(file)
--- a/
arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c
+++ b/
arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c
@@
-225,7
+225,8
@@
struct imx_ssi_platform_data eukrea_mbimxsd_ssi_pdata __initconst = {
static struct esdhc_platform_data sd1_pdata = {
.cd_gpio = GPIO_SD1CD,
- .wp_gpio = -EINVAL,
+ .cd_type = ESDHC_CD_GPIO,
+ .wp_type = ESDHC_WP_NONE,
};
/*