Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b009939 authored by Rob Herring's avatar Rob Herring
Browse files

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: default avatarRob Herring <rob.herring@calxeda.com>
Acked-by: default avatarGrant Likely <grant.likely@linaro.org>
Cc: James Hogan <james.hogan@imgtec.com>
Cc: linux-metag@vger.kernel.org
parent 0b814305

arch/metag/include/asm/prom.h

+0 −2
Original line number Diff line number Diff line
@@ -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 */

arch/metag/include/asm/setup.h

+1 −0
Original line number Diff line number Diff line
@@ -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 */

arch/metag/kernel/setup.c

+0 −1
Original line number Diff line number Diff line
@@ -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>