git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
plat-mxc
/
include
/
mach
/
mmc.h
diff --git
a/arch/arm/plat-mxc/include/mach/mmc.h
b/arch/arm/plat-mxc/include/mach/mmc.h
index de2128dada5cf2856118181bec1771fddef95fac..29115f405af91653683465fa9112fd0cff78213f 100644
(file)
--- a/
arch/arm/plat-mxc/include/mach/mmc.h
+++ b/
arch/arm/plat-mxc/include/mach/mmc.h
@@
-31,6
+31,9
@@
struct imxmmc_platform_data {
/* adjust slot voltage */
void (*setpower)(struct device *, unsigned int vdd);
+
+ /* enable card detect using DAT3 */
+ int dat3_card_detect;
};
#endif