diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-05-28 15:45:07 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-05-28 15:45:07 -0700 |
| commit | 4c50d22a0cf240918d53afbf9a8416a9d93aacee (patch) | |
| tree | 5b76b4c167cdc80a6911fc70b168c2a2025814db /arch/arm/mach-omap2/mmc-twl4030.h | |
| parent | 970a724d9173526512ebd8be991a4cbe18b7aace (diff) | |
| parent | 7419045016e5002b3ccee72b28e41bf53dca68f2 (diff) | |
Merge branch 'omap3-boards' into for-next
Diffstat (limited to 'arch/arm/mach-omap2/mmc-twl4030.h')
| -rw-r--r-- | arch/arm/mach-omap2/mmc-twl4030.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/mmc-twl4030.h b/arch/arm/mach-omap2/mmc-twl4030.h index ea59e8624290..3807c45c9a6c 100644 --- a/arch/arm/mach-omap2/mmc-twl4030.h +++ b/arch/arm/mach-omap2/mmc-twl4030.h @@ -16,9 +16,10 @@ struct twl4030_hsmmc_info { int gpio_wp; /* or -EINVAL */ char *name; /* or NULL for default */ struct device *dev; /* returned: pointer to mmc adapter */ + int ocr_mask; /* temporary HACK */ }; -#if defined(CONFIG_TWL4030_CORE) && \ +#if defined(CONFIG_REGULATOR) && \ (defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) || \ defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE)) |