Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

of/mips: Cleanup some include directives/files.

Browse source 
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>
This commit is contained in:
David Daney 2010-10-19 15:50:31 -07:00 committed by Grant Likely
parent f2ffa5ab74
commit 4c60071c1e
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
arch/mips/include/asm/prom.h
View file

@ -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 */

1
drivers/of/of_i2c.c
View file

@ -12,6 +12,7 @@
*/
#include <linux/i2c.h>
#include <linux/irq.h>
#include <linux/of.h>
#include <linux/of_i2c.h>
#include <linux/of_irq.h>