> linux-2.6-git.ori/arch/score/include/asm/types.h > linux-2.6-git.new/arch/score/include/asm/types.h > --- linux-2.6-git.ori/arch/score/include/asm/types.h 1970-01-01 > 08:00:00.000000000 +0800 > +++ linux-2.6-git.new/arch/score/include/asm/types.h 2009-03-23 > 15:03:24.000000000 +0800 > @@ -0,0 +1,24 @@ > +#ifndef _ASM_TYPES_H > +#define _ASM_TYPES_H > + > +#include <asm-generic/int-ll64.h> > + > +#ifndef __ASSEMBLY__ > +typedef unsigned short umode_t; > +#endif /* __ASSEMBLY__ */ > + > +#ifdef __KERNEL__ > +#define BITS_PER_LONG 32 > +#ifndef __ASSEMBLY__ > + > +typedef u32 dma_addr_t; > +typedef u64 dma64_addr_t; > + > +/* > + * Don't use phys_t. You've been warned. > + */ > +typedef unsigned long phys_t; If you do not use it drop it from this file. > diff -uprN -x linux-2.6-git.ori/Documentation/dontdiff > linux-2.6-git.ori/arch/score/include/asm/unaligned.h > linux-2.6-git.new/arch/score/include/asm/unaligned.h > --- linux-2.6-git.ori/arch/score/include/asm/unaligned.h 1970-01-01 > 08:00:00.000000000 +0800 > +++ linux-2.6-git.new/arch/score/include/asm/unaligned.h 2009-03-23 > 15:07:26.000000000 +0800 > @@ -0,0 +1,21 @@ > +#ifndef _ASM_SCORE_UNALIGNED_H > +#define _ASM_SCORE_UNALIGNED_H > + > +#include <linux/compiler.h> > +#if defined(__SCOREEB__) > +# include <linux/unaligned/be_struct.h> > +# include <linux/unaligned/le_byteshift.h> > +# include <linux/unaligned/generic.h> > +# define get_unaligned __get_unaligned_be > +# define put_unaligned __put_unaligned_be > +#elif defined(__SCOREEL__) > +# include <linux/unaligned/le_struct.h> > +# include <linux/unaligned/be_byteshift.h> > +# include <linux/unaligned/generic.h> > +# define get_unaligned __get_unaligned_le > +# define put_unaligned __put_unaligned_le > +#else > +# error "SCORE, but neither __SCOREEB__, nor __SCOREEL__???" > +#endif Where does __SCOREEB__ and __SCOREEL__ comes from? Can we use a CONFIG_ symbol here? The header is not exported so it is OK to use CONFIG_ and if we can puch the definition to Kconfig time then this is preferred. Sam -- To unsubscribe from this list: send the line "unsubscribe linux-arch" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
