diff options
| author | David S. Miller <davem@davemloft.net> | 2015-01-27 16:59:56 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-01-27 16:59:56 -0800 |
| commit | 95f873f2fff96c592c5d863e2a39825bd8bf0500 (patch) | |
| tree | 0d2dd664964ba2c701aefea5b4d1e85b481045e1 /arch/arm/mach-omap2/common.h | |
| parent | 8ea65f4a2dfaaf494ef42a16cbf2fea39b07450f (diff) | |
| parent | 59343cd7c4809cf7598789e1cd14563780ae4239 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
arch/arm/boot/dts/imx6sx-sdb.dts
net/sched/cls_bpf.c
Two simple sets of overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arm/mach-omap2/common.h')
| -rw-r--r-- | arch/arm/mach-omap2/common.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h index 377eea849e7b..64e44d6d07c0 100644 --- a/arch/arm/mach-omap2/common.h +++ b/arch/arm/mach-omap2/common.h @@ -211,6 +211,7 @@ extern struct device *omap2_get_iva_device(void); extern struct device *omap2_get_l3_device(void); extern struct device *omap4_get_dsp_device(void); +unsigned int omap4_xlate_irq(unsigned int hwirq); void omap_gic_of_init(void); #ifdef CONFIG_CACHE_L2X0 @@ -249,6 +250,7 @@ extern void omap4_cpu_die(unsigned int cpu); extern struct smp_operations omap4_smp_ops; extern void omap5_secondary_startup(void); +extern void omap5_secondary_hyp_startup(void); #endif #if defined(CONFIG_SMP) && defined(CONFIG_PM) |