diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-16 17:11:43 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-16 17:11:43 -0400 |
| commit | 2e57572a50a4de41c6cbc879a4866a312d4cd316 (patch) | |
| tree | c4f58ec96c06642c4b415b881d3f0a3b673d5b44 /arch/powerpc/boot/wrapper | |
| parent | 9b2e43ae4e9609f80034dfe8de895045cac52d77 (diff) | |
| parent | f948cc6ab9e61a8e88d70ee9aafc690e6d26f92c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Conflicts:
arch/sparc64/kernel/pci_psycho.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) |