diff options
| author | Robert Richter <robert.richter@amd.com> | 2008-09-24 05:25:31 -0400 |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2008-09-24 05:25:31 -0400 |
| commit | f78e80209cf143be49f268c340431ae9fa3abb74 (patch) | |
| tree | 820fa64b688099dfdd93d27ba03252738ca5c7e2 /arch/powerpc/boot/wrapper | |
| parent | 4c168eaf7ea39f25a45a3d8c7eebc3fedb633a1d (diff) | |
| parent | 24342c34a022ee90839873d91396045e12ef1090 (diff) | |
Merge commit 'v2.6.27-rc5' into tip/oprofile
Conflicts:
arch/x86/oprofile/nmi_int.c
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*) | |||
| 165 | binary=y | 165 | binary=y |
| 166 | gzip= | 166 | gzip= |
| 167 | case "$platform" in | 167 | case "$platform" in |
| 168 | *-mpc885ads|*-adder875*|*-ep88xc) | 168 | *-mpc866ads|*-mpc885ads|*-adder875*|*-ep88xc) |
| 169 | platformo=$object/cuboot-8xx.o | 169 | platformo=$object/cuboot-8xx.o |
| 170 | ;; | 170 | ;; |
| 171 | *5200*|*-motionpro) | 171 | *5200*|*-motionpro) |