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 v2.6.37-rc8 into powerpc/next
[pandora-kernel.git]
/
arch
/
arm
/
mach-msm
/
include
/
mach
/
mmc.h
diff --git
a/arch/arm/mach-msm/include/mach/mmc.h
b/arch/arm/mach-msm/include/mach/mmc.h
index
0ecf254
..
d54b6b0
100644
(file)
--- a/
arch/arm/mach-msm/include/mach/mmc.h
+++ b/
arch/arm/mach-msm/include/mach/mmc.h
@@
-15,7
+15,7
@@
struct embedded_sdio_data {
int num_funcs;
};
-struct mmc_platform_data {
+struct m
sm_m
mc_platform_data {
unsigned int ocr_mask; /* available voltages */
u32 (*translate_vdd)(struct device *, unsigned int);
unsigned int (*status)(struct device *);