Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+7 -10
+7 -10
arch/powerpc/include/asm/prom.h
··· 1 - #include <linux/of.h> /* linux/of.h gets to determine #include ordering */ 2 1 #ifndef _POWERPC_PROM_H 3 2 #define _POWERPC_PROM_H 4 3 #ifdef __KERNEL__ ··· 18 19 #include <linux/types.h> 19 20 #include <asm/irq.h> 20 21 #include <linux/atomic.h> 22 + 23 + /* These includes should be removed once implicit includes are cleaned up. */ 24 + #include <linux/of.h> 25 + #include <linux/of_fdt.h> 26 + #include <linux/of_address.h> 27 + #include <linux/of_irq.h> 28 + #include <linux/platform_device.h> 21 29 22 30 /* 23 31 * OF address retreival & translation ··· 130 124 * followed by # option vectors - 1, followed by the option vectors. 131 125 */ 132 126 extern unsigned char ibm_architecture_vec[]; 133 - 134 - /* These includes are put at the bottom because they may contain things 135 - * that are overridden by this file. Ideally they shouldn't be included 136 - * by this file, but there are a bunch of .c files that currently depend 137 - * on it. Eventually they will be cleaned up. */ 138 - #include <linux/of_fdt.h> 139 - #include <linux/of_address.h> 140 - #include <linux/of_irq.h> 141 - #include <linux/platform_device.h> 142 127 143 128 #endif /* __KERNEL__ */ 144 129 #endif /* _POWERPC_PROM_H */