[U-Boot] [PATCH 39/41] common: Move trap_init() out of common.h

[Simon Glass]

Move this function into the irq_legacy.h header file.

Signed-off-by: Simon Glass <sjg at chromium.org>
---

 arch/m68k/lib/traps.c | 1 +
 arch/mips/lib/traps.c | 1 +
 include/common.h      | 1 -
 include/irq_legacy.h  | 2 ++
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/arch/m68k/lib/traps.c b/arch/m68k/lib/traps.c
index 5d802077453..b2e7e9fe407 100644
--- a/arch/m68k/lib/traps.c
+++ b/arch/m68k/lib/traps.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <irq_legacy.h>
 #include <watchdog.h>
 #include <command.h>
 #include <asm/processor.h>
diff --git a/arch/mips/lib/traps.c b/arch/mips/lib/traps.c
index ff02d437a87..d173a1b0134 100644
--- a/arch/mips/lib/traps.c
+++ b/arch/mips/lib/traps.c
@@ -12,6 +12,7 @@
 
 #include <common.h>
 #include <cpu_legacy.h>
+#include <irq_legacy.h>
 #include <asm/mipsregs.h>
 #include <asm/addrspace.h>
 #include <asm/system.h>
diff --git a/include/common.h b/include/common.h
index a292d919390..e946e4d9b7f 100644
--- a/include/common.h
+++ b/include/common.h
@@ -145,7 +145,6 @@ void	relocate_code(ulong);
 void	relocate_code(ulong, gd_t *, ulong) __attribute__ ((noreturn));
 #endif
 ulong	get_endaddr   (void);
-void	trap_init     (ulong);
 
 void s_init(void);
 
diff --git a/include/irq_legacy.h b/include/irq_legacy.h
index 91b523d043a..a029c54b702 100644
--- a/include/irq_legacy.h
+++ b/include/irq_legacy.h
@@ -21,4 +21,6 @@ void reset_timer(void);
 void enable_interrupts(void);
 int disable_interrupts(void);
 
+void trap_init(unsigned long reloc_addr);
+
 #endif
-- 
2.23.0.444.g18eeb5a265-goog