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 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platf...
[pandora-kernel.git]
/
arch
/
arm
/
plat-omap
/
include
/
plat
/
mmc.h
diff --git
a/arch/arm/plat-omap/include/plat/mmc.h
b/arch/arm/plat-omap/include/plat/mmc.h
index
a1bac07
..
c835f1e
100644
(file)
--- a/
arch/arm/plat-omap/include/plat/mmc.h
+++ b/
arch/arm/plat-omap/include/plat/mmc.h
@@
-102,6
+102,10
@@
struct omap_mmc_platform_data {
/* Regulator off remapped to sleep */
unsigned vcc_aux_disable_is_sleep:1;
/* Regulator off remapped to sleep */
unsigned vcc_aux_disable_is_sleep:1;
+ /* we can put the features above into this variable */
+#define HSMMC_HAS_PBIAS (1 << 0)
+ unsigned features;
+
int switch_pin; /* gpio (card detect) */
int gpio_wp; /* gpio (write protect) */
int switch_pin; /* gpio (card detect) */
int gpio_wp; /* gpio (write protect) */