Hi Grant, Just first obvious thing: On Tue, 06 Oct 2009 22:30:59 -0600 Grant Likely <grant.likely@xxxxxxxxxxxx> wrote: > > diff --git a/arch/microblaze/include/asm/prom.h b/arch/microblaze/include/asm/prom.h > index 64e8b3a..5f461f0 100644 > --- a/arch/microblaze/include/asm/prom.h > +++ b/arch/microblaze/include/asm/prom.h > @@ -17,20 +17,10 @@ > #ifndef _ASM_MICROBLAZE_PROM_H > #define _ASM_MICROBLAZE_PROM_H > #ifdef __KERNEL__ > - > -/* Definitions used by the flattened device tree */ > -#define OF_DT_HEADER 0xd00dfeed /* marker */ This is used in arch/microblaze/kernel/head.S, but you move its definition inside "#ifndef __ASSEMBLY__" below. You should probably replace the include of asm/prom.h in arch/microblaze/kernel/head.S with linux/of_fdt.h (assuming that the comment in there is correct). > -#define OF_DT_BEGIN_NODE 0x1 /* Start of node, full name */ > -#define OF_DT_END_NODE 0x2 /* End node */ > -#define OF_DT_PROP 0x3 /* Property: name off, size, content */ > -#define OF_DT_NOP 0x4 /* nop */ > -#define OF_DT_END 0x9 > - > -#define OF_DT_VERSION 0x10 > - > #ifndef __ASSEMBLY__ > > #include <linux/types.h> > +#include <linux/of_fdt.h> > #include <linux/proc_fs.h> > #include <linux/platform_device.h> > #include <asm/irq.h> -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpwvI2mHq6I2.pgp
Description: PGP signature
