Commit c051a7ec authored by Matt Porter's avatar Matt Porter Committed by Paul Mackerras

PPC32: Resolve colliding includes in boot wrappers.

parent 1c4f8b0a
...@@ -11,13 +11,17 @@ ...@@ -11,13 +11,17 @@
#include <linux/elf.h> #include <linux/elf.h>
#include <linux/string.h> #include <linux/string.h>
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
#include <asm/ibm4xx.h>
#include <asm/mmu.h> #include <asm/mmu.h>
#include <asm/mpc8xx.h>
#include <asm/mpc8260.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/residual.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 "nonstdio.h"
#include "zlib.h" #include "zlib.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment