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

Commit 5c19c5c6 authored by Rob Herring's avatar Rob Herring
Browse files

powerpc: clean-up include ordering in prom.h 



Now that the core OF headers don't depend on prom.h, rearrange the
includes. There are still lots of implicit includes in the powerpc tree,
so the includes of OF headers are still necessary.

Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
Acked-by: default avatarGrant Likely <grant.likely@linaro.org>
parent d0dfa16a

arch/powerpc/include/asm/prom.h

+7 −10
Original line number Original line Diff line number Diff line 
#include <linux/of.h>	/* linux/of.h gets to determine #include ordering */

#ifndef _POWERPC_PROM_H

#ifndef _POWERPC_PROM_H

#define _POWERPC_PROM_H

#define _POWERPC_PROM_H

#ifdef __KERNEL__

#ifdef __KERNEL__
@@ -20,6 +19,13 @@ 
#include <asm/irq.h>

#include <asm/irq.h>

#include <linux/atomic.h>

#include <linux/atomic.h>





/* These includes should be removed once implicit includes are cleaned up. */

#include <linux/of.h>

#include <linux/of_fdt.h>

#include <linux/of_address.h>

#include <linux/of_irq.h>

#include <linux/platform_device.h>



/*

/*

 * OF address retreival & translation

 * OF address retreival & translation

 */

 */
@@ -125,14 +131,5 @@ struct of_drconf_cell { 
 */

 */

extern unsigned char ibm_architecture_vec[];

extern unsigned char ibm_architecture_vec[];





/* These includes are put at the bottom because they may contain things

 * that are overridden by this file.  Ideally they shouldn't be included

 * by this file, but there are a bunch of .c files that currently depend

 * on it.  Eventually they will be cleaned up. */

#include <linux/of_fdt.h>

#include <linux/of_address.h>

#include <linux/of_irq.h>

#include <linux/platform_device.h>



#endif /* __KERNEL__ */

#endif /* __KERNEL__ */

#endif /* _POWERPC_PROM_H */
 
#endif /* _POWERPC_PROM_H */