diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-05-09 09:58:42 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-05-09 09:58:42 -0700 |
| commit | bfd17879866b36e95c58721da070d9f2ac7f8901 (patch) | |
| tree | 2381206a25ba7d664f4b787321ca5ce253e6a22c /arch/arm/plat-omap/include/plat/mmc.h | |
| parent | 743a6d923f803c861a24d173e1d1818ca8ac0384 (diff) | |
| parent | 414e41286e3aeb87de140ef4c75100f9344c32b2 (diff) | |
Merge tag 'omap-devel-c-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into devel-hwmod-dataomap-devel-hwmod-data-for-v3.5
Some OMAP IP block data additions for 3.5, along with a
fix for a longstanding watchdog timer integration problem.
Diffstat (limited to 'arch/arm/plat-omap/include/plat/mmc.h')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/mmc.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/include/plat/mmc.h b/arch/arm/plat-omap/include/plat/mmc.h index 7a38750c0079..3e7ae0f0215f 100644 --- a/arch/arm/plat-omap/include/plat/mmc.h +++ b/arch/arm/plat-omap/include/plat/mmc.h @@ -16,6 +16,7 @@ #include <linux/mmc/host.h> #include <plat/board.h> +#include <plat/omap_hwmod.h> #define OMAP15XX_NR_MMC 1 #define OMAP16XX_NR_MMC 2 @@ -195,4 +196,7 @@ static inline int omap_mmc_add(const char *name, int id, unsigned long base, } #endif + +extern int omap_msdi_reset(struct omap_hwmod *oh); + #endif |