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 'master' of git://git.infradead.org/users/linville/wireless into for...
[pandora-kernel.git]
/
arch
/
arm
/
mach-imx
/
mach-pcm043.c
diff --git
a/arch/arm/mach-imx/mach-pcm043.c
b/arch/arm/mach-imx/mach-pcm043.c
index
163cc31
..
660ec3e
100644
(file)
--- a/
arch/arm/mach-imx/mach-pcm043.c
+++ b/
arch/arm/mach-imx/mach-pcm043.c
@@
-349,6
+349,8
@@
__setup("otg_mode=", pcm043_otg_mode);
static struct esdhc_platform_data sd1_pdata = {
.wp_gpio = SD1_GPIO_WP,
.cd_gpio = SD1_GPIO_CD,
+ .wp_type = ESDHC_WP_GPIO,
+ .cd_type = ESDHC_CD_GPIO,
};
/*