iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

metag: move setup_machine_fdt declaration from prom.h

Browse Source 
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
This commit is contained in:
Rob Herring 2013-09-08 14:27:53 -05:00
parent 0b81430590
commit 7b009939af
3 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/metag/include/asm/prom.h
View File

@ -14,10 +14,8 @@
#ifndef __ASM_METAG_PROM_H #ifndef __ASM_METAG_PROM_H
#define __ASM_METAG_PROM_H #define __ASM_METAG_PROM_H
#include <asm/setup.h>
#define HAVE_ARCH_DEVTREE_FIXUPS #define HAVE_ARCH_DEVTREE_FIXUPS
extern const struct machine_desc *setup_machine_fdt(void *dt);
extern void copy_fdt(void); extern void copy_fdt(void);
#endif /* __ASM_METAG_PROM_H */ #endif /* __ASM_METAG_PROM_H */

1
arch/metag/include/asm/setup.h
View File

@ -3,6 +3,7 @@
#include <uapi/asm/setup.h> #include <uapi/asm/setup.h>
extern const struct machine_desc *setup_machine_fdt(void *dt);
void per_cpu_trap_init(unsigned long); void per_cpu_trap_init(unsigned long);
extern void __init dump_machine_table(void); extern void __init dump_machine_table(void);
#endif /* _ASM_METAG_SETUP_H */ #endif /* _ASM_METAG_SETUP_H */

1
arch/metag/kernel/setup.c
View File

@ -42,7 +42,6 @@
#include <asm/mmu.h> #include <asm/mmu.h>
#include <asm/mmzone.h> #include <asm/mmzone.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/prom.h>
#include <asm/sections.h> #include <asm/sections.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/traps.h> #include <asm/traps.h>