diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-05-09 23:32:44 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-05-09 23:32:44 +0200 |
| commit | 65c98038394e65228490ef44353f5d4665690f55 (patch) | |
| tree | c7bd5afb40d455d995ec65bd9a6fb5d456e0bd45 /arch/arm/mach-omap2/common.h | |
| parent | Merge tag 'omap-devel-c-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| parent | ARM: OMAP: igep0020: Specify the VPLL2 regulator unconditionally (diff) | |
| download | linux-65c98038394e65228490ef44353f5d4665690f55.tar.xz linux-65c98038394e65228490ef44353f5d4665690f55.zip | |
Merge branch 'fixes-non-critical' into cleanup-devices
Diffstat (limited to 'arch/arm/mach-omap2/common.h')
| -rw-r--r-- | arch/arm/mach-omap2/common.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h index 0672fc54b30f..65c710bebf11 100644 --- a/arch/arm/mach-omap2/common.h +++ b/arch/arm/mach-omap2/common.h @@ -27,6 +27,7 @@ #ifndef __ASSEMBLER__ #include <linux/delay.h> +#include <linux/i2c/twl.h> #include <plat/common.h> #include <asm/proc-fns.h> @@ -255,6 +256,8 @@ static inline u32 omap4_mpuss_read_prev_context_state(void) struct omap_sdrc_params; extern void omap_sdrc_init(struct omap_sdrc_params *sdrc_cs0, struct omap_sdrc_params *sdrc_cs1); +struct omap2_hsmmc_info; +extern int omap4_twl6030_hsmmc_init(struct omap2_hsmmc_info *controllers); #endif /* __ASSEMBLER__ */ #endif /* __ARCH_ARM_MACH_OMAP2PLUS_COMMON_H */ |