diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-26 13:07:27 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-26 13:07:27 -0400 |
| commit | 811da237ba39d86846645379763655ddf0f7907e (patch) | |
| tree | e06cf5f94139fa9f9b40d9e285bc089bfdef219b /arch/powerpc/boot/wrapper | |
| parent | b8e6c91c74e9f0279b7c51048779b3d62da60b88 (diff) | |
| parent | 9bdbb9633281b58ff483ede723f8c4a6344cab2f (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
powerpc: Update defconfigs for most non-embedded platforms
powerpc: Export CMO_PageSize
powerpc/ps3: Fix ioremap of spu shadow regs
powerpc/ps3: Rework htab code to remove ioremap
powerpc/ps3: Update ps3_defconfig
powerpc/cell/oprofile: Avoid double vfree of profile buffer
powerpc: Update defconfigs for FSL PPC boards
powerpc: Add cuImage.mpc866ads to the bootwrapper as a cuboot-8xx target
cpm2: Fix race condition in CPM2 GPIO library.
powerpc: fix memory leaks in QE library
powerpc/85xx: TQM8548: DTS file fixes and cleanup
powerpc: Fix whitespace merge in mpc8641 hpcn device tree
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) |