Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35d77ef1 authored by Paul Mackerras's avatar Paul Mackerras
Browse files

Merge branch 'for-2.6.25' of... 

Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx into merge
parents 4187377b f62f2fdd

arch/powerpc/boot/cuboot-bamboo.c

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include "44x.h"

#include "cuboot.h"



#define TARGET_4xx

#define TARGET_44x

#include "ppcboot.h"

arch/powerpc/boot/cuboot-ebony.c

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include "44x.h"

#include "cuboot.h"



#define TARGET_4xx

#define TARGET_44x

#include "ppcboot.h"

arch/powerpc/boot/cuboot-katmai.c

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include "44x.h"

#include "cuboot.h"



#define TARGET_4xx

#define TARGET_44x

#include "ppcboot.h"

arch/powerpc/boot/cuboot-taishan.c

+2 −0
Original line number Diff line number Diff line
@@ -21,7 +21,9 @@ 
#include "dcr.h"

#include "4xx.h"



#define TARGET_4xx

#define TARGET_44x

#define TARGET_440GX

#include "ppcboot.h"



static bd_t bd;

arch/powerpc/boot/cuboot-warp.c

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include "4xx.h"

#include "cuboot.h"



#define TARGET_4xx

#define TARGET_44x

#include "ppcboot.h"