diff options
| author | David S. Miller <davem@davemloft.net> | 2017-04-20 10:35:33 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-04-20 10:35:33 -0400 |
| commit | 7b9f6da175f9387ebfc202f35e0d39514899ab19 (patch) | |
| tree | a884c05aaeff40d8f80831549cccc820dcdd0f4f /arch/arm/mach-omap2/common.h | |
| parent | 9868879f293c599ce13b584c5bd8800312970781 (diff) | |
| parent | 1debdc8f9ebd07daf140e417b3841596911e0066 (diff) | |
| download | op-kernel-dev-7b9f6da175f9387ebfc202f35e0d39514899ab19.zip op-kernel-dev-7b9f6da175f9387ebfc202f35e0d39514899ab19.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
A function in kernel/bpf/syscall.c which got a bug fix in 'net'
was moved to kernel/bpf/verifier.c in 'net-next'.
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 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h index c4f2ace..3089d3bf 100644 --- a/arch/arm/mach-omap2/common.h +++ b/arch/arm/mach-omap2/common.h @@ -270,6 +270,7 @@ extern const struct smp_operations omap4_smp_ops; extern int omap4_mpuss_init(void); extern int omap4_enter_lowpower(unsigned int cpu, unsigned int power_state); extern int omap4_hotplug_cpu(unsigned int cpu, unsigned int power_state); +extern u32 omap4_get_cpu1_ns_pa_addr(void); #else static inline int omap4_enter_lowpower(unsigned int cpu, unsigned int power_state) |
