diff options
author | Steve French <sfrench@us.ibm.com> | 2008-08-28 04:47:00 +0200 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2008-08-28 04:47:00 +0200 |
commit | 6405c9cd9bf7b1c35ed76ef8ee3e217056285702 (patch) | |
tree | 0659c9ae17d1375f185f88f4f7fef1a667f375d8 /arch/powerpc/boot/wrapper | |
parent | [CIFS] Fix plaintext authentication (diff) | |
parent | IB/mlx4: Actually return L_Key and R_Key for fast register MRs (diff) | |
download | linux-6405c9cd9bf7b1c35ed76ef8ee3e217056285702.tar.xz linux-6405c9cd9bf7b1c35ed76ef8ee3e217056285702.zip |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/powerpc/boot/wrapper')
-rwxr-xr-x | arch/powerpc/boot/wrapper | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper index 644bf9d4ea00..965c237c122d 100755 --- a/arch/powerpc/boot/wrapper +++ b/arch/powerpc/boot/wrapper @@ -165,7 +165,7 @@ cuboot*) binary=y gzip= case "$platform" in - *-mpc885ads|*-adder875*|*-ep88xc) + *-mpc866ads|*-mpc885ads|*-adder875*|*-ep88xc) platformo=$object/cuboot-8xx.o ;; *5200*|*-motionpro) |