diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-09 09:47:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-09 09:47:21 -0800 |
| commit | 49456d8d2c60a41b82d1ea8f8b49ea425e463b26 (patch) | |
| tree | e556734f9aa29007f86deb35e0e9fa182923dd23 | |
| parent | d5d6eba94b4c390c29e375bacabf9fdc2f01243d (diff) | |
| parent | a556bec9955c8e47b40a87dbfeef6f24d3b2228f (diff) | |
| download | linux-3.10-49456d8d2c60a41b82d1ea8f8b49ea425e463b26.tar.gz linux-3.10-49456d8d2c60a41b82d1ea8f8b49ea425e463b26.tar.bz2 linux-3.10-49456d8d2c60a41b82d1ea8f8b49ea425e463b26.zip | |
Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev
* 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev:
m32r: fix arch/m32r/boot/compressed/Makefile
| -rw-r--r-- | arch/m32r/boot/compressed/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m32r/boot/compressed/Makefile b/arch/m32r/boot/compressed/Makefile index 1003880d0df..177716b1d61 100644 --- a/arch/m32r/boot/compressed/Makefile +++ b/arch/m32r/boot/compressed/Makefile @@ -1,5 +1,5 @@ # -# linux/arch/sh/boot/compressed/Makefile +# linux/arch/m32r/boot/compressed/Makefile # # create a compressed vmlinux image from the original vmlinux # @@ -47,5 +47,5 @@ suffix_$(CONFIG_KERNEL_GZIP) = gz suffix_$(CONFIG_KERNEL_BZIP2) = bz2 suffix_$(CONFIG_KERNEL_LZMA) = lzma -$(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.$(suffix_y) FORCE +$(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.$(suffix-y) FORCE $(call if_changed,ld) |