aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/metag/include/asm/prom.h2
-rw-r--r--arch/metag/include/asm/setup.h1
-rw-r--r--arch/metag/kernel/setup.c1
3 files changed, 1 insertions, 3 deletions
diff --git a/arch/metag/include/asm/prom.h b/arch/metag/include/asm/prom.h
index 9f67cbf3dcb7..e19022c5a0cb 100644
--- a/arch/metag/include/asm/prom.h
+++ b/arch/metag/include/asm/prom.h
@@ -14,10 +14,8 @@
14#ifndef __ASM_METAG_PROM_H 14#ifndef __ASM_METAG_PROM_H
15#define __ASM_METAG_PROM_H 15#define __ASM_METAG_PROM_H
16 16
17#include <asm/setup.h>
18#define HAVE_ARCH_DEVTREE_FIXUPS 17#define HAVE_ARCH_DEVTREE_FIXUPS
19 18
20extern const struct machine_desc *setup_machine_fdt(void *dt);
21extern void copy_fdt(void); 19extern void copy_fdt(void);
22 20
23#endif /* __ASM_METAG_PROM_H */ 21#endif /* __ASM_METAG_PROM_H */
diff --git a/arch/metag/include/asm/setup.h b/arch/metag/include/asm/setup.h
index e13083b15dd0..e9fdee9452b1 100644
--- a/arch/metag/include/asm/setup.h
+++ b/arch/metag/include/asm/setup.h
@@ -3,6 +3,7 @@
3 3
4#include <uapi/asm/setup.h> 4#include <uapi/asm/setup.h>
5 5
6extern const struct machine_desc *setup_machine_fdt(void *dt);
6void per_cpu_trap_init(unsigned long); 7void per_cpu_trap_init(unsigned long);
7extern void __init dump_machine_table(void); 8extern void __init dump_machine_table(void);
8#endif /* _ASM_METAG_SETUP_H */ 9#endif /* _ASM_METAG_SETUP_H */
diff --git a/arch/metag/kernel/setup.c b/arch/metag/kernel/setup.c
index 92cc119594d3..8c4b3976bebf 100644
--- a/arch/metag/kernel/setup.c
+++ b/arch/metag/kernel/setup.c
@@ -42,7 +42,6 @@
42#include <asm/mmu.h> 42#include <asm/mmu.h>
43#include <asm/mmzone.h> 43#include <asm/mmzone.h>
44#include <asm/processor.h> 44#include <asm/processor.h>
45#include <asm/prom.h>
46#include <asm/sections.h> 45#include <asm/sections.h>
47#include <asm/setup.h> 46#include <asm/setup.h>
48#include <asm/traps.h> 47#include <asm/traps.h>