diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-01 14:45:48 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-01 14:45:48 -0400 |
| commit | 10027471a305c5491d23add394041120720e8a11 (patch) | |
| tree | 9e3c91a56ba45d4beb26f8ae84021b1897da460d /arch/sh/boot/Makefile | |
| parent | 61434392f797cf89872bda87dff8b3395edf4108 (diff) | |
| parent | 26b63e995113dd48fde66c0d0d65eecc6df53172 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.25
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.25:
sh: Fix up uImage compression type
remove include/asm-sh/floppy.h
sh: Fix TIF_USEDFPU clearing under FPU emulation.
sh: Fix occasional FPU register corruption under preempt.
Diffstat (limited to 'arch/sh/boot/Makefile')
| -rw-r--r-- | arch/sh/boot/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/boot/Makefile b/arch/sh/boot/Makefile index 3dda24daa0a8..89b408620dcb 100644 --- a/arch/sh/boot/Makefile +++ b/arch/sh/boot/Makefile | |||
| @@ -44,7 +44,7 @@ KERNEL_ENTRY := $(shell /bin/bash -c 'printf "0x%08x" \ | |||
| 44 | 44 | ||
| 45 | quiet_cmd_uimage = UIMAGE $@ | 45 | quiet_cmd_uimage = UIMAGE $@ |
| 46 | cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A sh -O linux -T kernel \ | 46 | cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A sh -O linux -T kernel \ |
| 47 | -C none -a $(KERNEL_LOAD) -e $(KERNEL_ENTRY) \ | 47 | -C gzip -a $(KERNEL_LOAD) -e $(KERNEL_ENTRY) \ |
| 48 | -n 'Linux-$(KERNELRELEASE)' -d $< $@ | 48 | -n 'Linux-$(KERNELRELEASE)' -d $< $@ |
| 49 | 49 | ||
| 50 | $(obj)/uImage: $(obj)/vmlinux.bin.gz FORCE | 50 | $(obj)/uImage: $(obj)/vmlinux.bin.gz FORCE |