diff options
author | Olof Johansson <olof@lixom.net> | 2012-11-06 14:09:10 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-11-06 14:20:15 -0500 |
commit | a7e816b857947f0a4d59c0d9c69810977479ac50 (patch) | |
tree | b758974b49ed17adb1242a2edf5b18ead97755b2 | |
parent | f60be0d5c1f2dd0188205f04a4a7b8778234fd9c (diff) |
ARM: highbank: add ifdef guards to core.h
Fixes build error due to multiple includes:
In file included from arch/arm/mach-highbank/sysregs.h:23:0,
from arch/arm/mach-highbank/system.c:20:
arch/arm/mach-highbank/core.h:8:91: error: redefinition of 'highbank_lluart_map_io'
In file included from arch/arm/mach-highbank/system.c:19:0:
arch/arm/mach-highbank/core.h:8:91: note: previous definition of 'highbank_lluart_map_io' was here
Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r-- | arch/arm/mach-highbank/core.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-highbank/core.h b/arch/arm/mach-highbank/core.h index 286ec82a4f63..068c68795c8c 100644 --- a/arch/arm/mach-highbank/core.h +++ b/arch/arm/mach-highbank/core.h | |||
@@ -1,3 +1,6 @@ | |||
1 | #ifndef __HIGHBANK_CORE_H | ||
2 | #define __HIGHBANK_CORE_H | ||
3 | |||
1 | extern void highbank_set_cpu_jump(int cpu, void *jump_addr); | 4 | extern void highbank_set_cpu_jump(int cpu, void *jump_addr); |
2 | extern void highbank_clocks_init(void); | 5 | extern void highbank_clocks_init(void); |
3 | extern void highbank_restart(char, const char *); | 6 | extern void highbank_restart(char, const char *); |
@@ -18,3 +21,5 @@ extern void highbank_smc1(int fn, int arg); | |||
18 | extern void highbank_cpu_die(unsigned int cpu); | 21 | extern void highbank_cpu_die(unsigned int cpu); |
19 | 22 | ||
20 | extern struct smp_operations highbank_smp_ops; | 23 | extern struct smp_operations highbank_smp_ops; |
24 | |||
25 | #endif | ||