diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-12-03 23:59:07 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-12-03 23:59:07 -0500 |
| commit | 79acbb3ff2d8095b692e1502b9eb2ccec348de26 (patch) | |
| tree | 6ab773e5a8f9de2cd6443362b21d0d6fffe3b35e /arch/powerpc/boot | |
| parent | 19a79859e168640f8e16d7b216d211c1c52b687a (diff) | |
| parent | 2b5f6dcce5bf94b9b119e9ed8d537098ec61c3d2 (diff) | |
Merge branch 'linux-2.6' into for-linus
Diffstat (limited to 'arch/powerpc/boot')
| -rw-r--r-- | arch/powerpc/boot/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index 042bac319be0..4a6f0f054b72 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile | |||
| @@ -116,7 +116,7 @@ endif | |||
| 116 | quiet_cmd_wrap = WRAP $@ | 116 | quiet_cmd_wrap = WRAP $@ |
| 117 | cmd_wrap =$(CONFIG_SHELL) $(wrapper) -c -o $@ -p $2 $(CROSSWRAP) vmlinux | 117 | cmd_wrap =$(CONFIG_SHELL) $(wrapper) -c -o $@ -p $2 $(CROSSWRAP) vmlinux |
| 118 | quiet_cmd_wrap_initrd = WRAP $@ | 118 | quiet_cmd_wrap_initrd = WRAP $@ |
| 119 | cmd_wrap_initrd =$(wrapper) -c -o $@ -p $2 $(CROSSWRAP) \ | 119 | cmd_wrap_initrd =$(CONFIG_SHELL) $(wrapper) -c -o $@ -p $2 $(CROSSWRAP) \ |
| 120 | -i $(obj)/ramdisk.image.gz vmlinux | 120 | -i $(obj)/ramdisk.image.gz vmlinux |
| 121 | 121 | ||
| 122 | $(obj)/zImage.chrp: vmlinux $(wrapperbits) | 122 | $(obj)/zImage.chrp: vmlinux $(wrapperbits) |