summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/common.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-05-22 09:27:39 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-05-22 09:27:39 -0700
commit8dca6010d44cc722a94dc6da96560f9083dac782 (patch)
treec804c272bc3d07a05459c2688e4b1c8b141d561c /arch/arm/mach-omap2/common.h
parent9bc747bea5fad819e0c0ad96e6a67ea0640dfe2b (diff)
parent74c437532b8b5db53509963ec38e8424c56ff6f4 (diff)
Merge tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull non-critical arm-soc bug fixes from Olof Johansson: "These bug fixes were not important enough to have them included in the v3.4 release, mostly because they cover harmless warnings or unrealistic configurations. Instead we queue them up to be picked up in the next merge window." Fixed up trivial conflict in arch/arm/mach-omap2/board-omap4panda.c * tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: ARM: spear6xx: remove board selection options ARM: OMAP: igep0020: Specify the VPLL2 regulator unconditionally ARM: OMAP2+: INTC: fix Kconfig option for TI81XX ARM: OMAP2+: remove incorrect irq_chip ack field ARM: OMAP4: Adding ID for OMAP4460 ES1.1 ARM: OMAP4: panda: add statics to remove warnings ARM: OMAP2+: Incorrect Register Offsets in OMAP Mailbox ARM: OMAP: fix trivial warnings for dspbridge arm: davinci: use for_each_set_bit_from ARM: OMAP4: hsmmc: check for null pointer ARM: OMAP1: fix compilation issue in board-sx1.c ARM: disable SUSPEND/ARCH_SUSPEND_POSSIBLE for ARCH_TEGRA ARM: davinci: da850-evm: fix section mismatch ARM: tegra: add pll_x freq table entry for 750MHz ARM: davinci: mark spi_board_info arguments as const ARM: davinci: fix incorrect pdctl next bit position
Diffstat (limited to 'arch/arm/mach-omap2/common.h')
-rw-r--r--arch/arm/mach-omap2/common.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h
index 0e95efccd2d..f14b3aec58c 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>
@@ -252,6 +253,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 */