summaryrefslogtreecommitdiffstats
path: root/arch/mips/include
diff options
context:
space:
mode:
authorDavid Daney <ddaney@caviumnetworks.com>2010-10-19 15:50:31 -0700
committerGrant Likely <grant.likely@secretlab.ca>2010-10-21 11:10:11 -0600
commit4c60071c1ea3e204b9dc25c7519f7beef355d47f (patch)
tree4c9cb9f3b215182d5adba68b8a3c26fd47d47dd6 /arch/mips/include
parentf2ffa5ab74f4dfd598860f96ca37a71c4d0a28a8 (diff)
downloadop-kernel-dev-4c60071c1ea3e204b9dc25c7519f7beef355d47f.zip
op-kernel-dev-4c60071c1ea3e204b9dc25c7519f7beef355d47f.tar.gz
of/mips: Cleanup some include directives/files.
The __init directives should go on the definitions of things, not the declaration, also __init is meaningless for inline functions, so remove it from prom.h. This allows us to get rid of a useless #include, but most of the rest of them are useless too, so kill them as well. If of_i2c.c needs irq definitions, it should include linux/irq.h directly, not assume indirect inclusion via asm/prom.h. Signed-off-by: David Daney <ddaney@caviumnetworks.com> Acked-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'arch/mips/include')
-rw-r--r--arch/mips/include/asm/prom.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/mips/include/asm/prom.h b/arch/mips/include/asm/prom.h
index 23f8237..f29b862 100644
--- a/arch/mips/include/asm/prom.h
+++ b/arch/mips/include/asm/prom.h
@@ -12,10 +12,6 @@
#define __ASM_MIPS_PROM_H
#ifdef CONFIG_OF
-#include <linux/init.h>
-
-#include <asm/setup.h>
-#include <asm/irq.h>
#include <asm/bootinfo.h>
/* which is compatible with the flattened device tree (FDT) */
@@ -27,9 +23,9 @@ extern int early_init_dt_scan_memory_arch(unsigned long node,
extern int reserve_mem_mach(unsigned long addr, unsigned long size);
extern void free_mem_mach(unsigned long addr, unsigned long size);
-extern void __init device_tree_init(void);
+extern void device_tree_init(void);
#else /* CONFIG_OF */
-static inline void __init device_tree_init(void) { }
+static inline void device_tree_init(void) { }
#endif /* CONFIG_OF */
#endif /* _ASM_MIPS_PROM_H */
OpenPOWER on IntegriCloud