diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2013-09-17 14:34:00 -0500 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2013-10-09 20:04:11 -0500 |
| commit | 5c19c5c6d4f5e1dc0d0e26b683bc820dda01fe06 (patch) | |
| tree | 233cfc00452b6c552d68b213c632e7cf7ccc12ca | |
| parent | d0dfa16a600190d142f7538e5909d13c35b60d98 (diff) | |
| download | linux-5c19c5c6d4f5e1dc0d0e26b683bc820dda01fe06.tar.bz2 | |
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: Rob Herring <rob.herring@calxeda.com>
Acked-by: Grant Likely <grant.likely@linaro.org>
| -rw-r--r-- | arch/powerpc/include/asm/prom.h | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/arch/powerpc/include/asm/prom.h b/arch/powerpc/include/asm/prom.h index b8774bdc69e0..7687f82a3217 100644 --- a/arch/powerpc/include/asm/prom.h +++ b/arch/powerpc/include/asm/prom.h @@ -1,4 +1,3 @@ -#include <linux/of.h> /* linux/of.h gets to determine #include ordering */ #ifndef _POWERPC_PROM_H #define _POWERPC_PROM_H #ifdef __KERNEL__ @@ -20,6 +19,13 @@ #include <asm/irq.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 */ @@ -125,14 +131,5 @@ struct of_drconf_cell { */ 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 /* _POWERPC_PROM_H */ |