Skip to content

Commit

Permalink
metag: move setup_machine_fdt declaration from prom.h
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Rob Herring committed Oct 10, 2013
1 parent 0b81430 commit 7b00993
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 3 deletions.
2 changes: 0 additions & 2 deletions arch/metag/include/asm/prom.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
1 change: 1 addition & 0 deletions arch/metag/include/asm/setup.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
1 change: 0 additions & 1 deletion arch/metag/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 7b00993

Please sign in to comment.