summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-11-06 11:09:10 -0800
committerOlof Johansson <olof@lixom.net>2012-11-06 11:20:15 -0800
commita7e816b857947f0a4d59c0d9c69810977479ac50 (patch)
treeb758974b49ed17adb1242a2edf5b18ead97755b2
parentf60be0d5c1f2dd0188205f04a4a7b8778234fd9c (diff)
downloadblackbird-op-linux-a7e816b857947f0a4d59c0d9c69810977479ac50.tar.gz
blackbird-op-linux-a7e816b857947f0a4d59c0d9c69810977479ac50.zip
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.h5
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 @@
+#ifndef __HIGHBANK_CORE_H
+#define __HIGHBANK_CORE_H
+
extern void highbank_set_cpu_jump(int cpu, void *jump_addr);
extern void highbank_clocks_init(void);
extern void highbank_restart(char, const char *);
@@ -18,3 +21,5 @@ extern void highbank_smc1(int fn, int arg);
extern void highbank_cpu_die(unsigned int cpu);
extern struct smp_operations highbank_smp_ops;
+
+#endif
OpenPOWER on IntegriCloud