aboutsummaryrefslogtreecommitdiff
path: root/arch/metag
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2013-09-08 14:27:53 -0500
committerRob Herring <rob.herring@calxeda.com>2013-10-09 20:04:03 -0500
commit7b009939af9bc7b698d7ddec03d53604efff881c (patch)
treeb43a8d4135458e93c8bb1fa6a95b1a84992ea2b9 /arch/metag
parent0b81430590882954ed60a138ac2bad1149303165 (diff)
downloadlinux-linaro-stable-7b009939af9bc7b698d7ddec03d53604efff881c.tar.gz
metag: move setup_machine_fdt declaration from prom.h
Move setup_machine_fdt out of prom.h and into asm/setup.h in preparation to remove prom.h. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Acked-by: Grant Likely <grant.likely@linaro.org> Cc: James Hogan <james.hogan@imgtec.com> Cc: linux-metag@vger.kernel.org
Diffstat (limited to 'arch/metag')
-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 @@
#ifndef __ASM_METAG_PROM_H
#define __ASM_METAG_PROM_H
-#include <asm/setup.h>
#define HAVE_ARCH_DEVTREE_FIXUPS
-extern const struct machine_desc *setup_machine_fdt(void *dt);
extern void copy_fdt(void);
#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 @@
#include <uapi/asm/setup.h>
+extern const struct machine_desc *setup_machine_fdt(void *dt);
void per_cpu_trap_init(unsigned long);
extern void __init dump_machine_table(void);
#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 @@
#include <asm/mmu.h>
#include <asm/mmzone.h>
#include <asm/processor.h>
-#include <asm/prom.h>
#include <asm/sections.h>
#include <asm/setup.h>
#include <asm/traps.h>