PPC32: Resolve colliding includes in boot wrappers.

c051a7ec · Matt Porter · Paul Mackerras · 1c4f8b0a · c051a7ec
Commit c051a7ec authored Jun 07, 2003 by Matt Porter Committed by Paul Mackerras Jun 07, 2003
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

arch/ppc/boot/simple/misc-embedded.c arch/ppc/boot/simple/misc-embedded.c +7 -3

No files found.
--- a/arch/ppc/boot/simple/misc-embedded.c
+++ b/arch/ppc/boot/simple/misc-embedded.c
@@ -11,13 +11,17 @@
 #include <linux/elf.h>
 #include <linux/string.h>
 #include <asm/bootinfo.h>
-#include <asm/ibm4xx.h>
 #include <asm/mmu.h>
-#include <asm/mpc8xx.h>
-#include <asm/mpc8260.h>
 #include <asm/page.h>
 #include <asm/processor.h>
 #include <asm/residual.h>
+#if defined(CONFIG_4xx)
+#include <asm/ibm4xx.h>
+#elif defined(CONFIG_8xx)
+#include <asm/mpc8xx.h>
+#elif defined(CONFIG_8260)
+#include <asm/mpc8260.h>
+#endif

 #include "nonstdio.h"
 #include "zlib.h"