diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-25 15:52:48 +0100 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-25 15:52:48 +0100 |
commit | f1487fcbe47cd2bc0c71e8598bf9eb6a82dec544 (patch) | |
tree | 4c7abed6047538c13dd024a8ecffd15f31b4609a /arch/mips/boot/Makefile | |
parent | ASoC: ad1836: reset and restore clock control mode in suspend/resume entry (diff) | |
parent | ASoC: fix a memory-leak in wm8903 (diff) | |
download | linux-f1487fcbe47cd2bc0c71e8598bf9eb6a82dec544.tar.xz linux-f1487fcbe47cd2bc0c71e8598bf9eb6a82dec544.zip |
Merge branch 'for-2.6.33' into for-2.6.34
Diffstat (limited to 'arch/mips/boot/Makefile')
-rw-r--r-- | arch/mips/boot/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/boot/Makefile b/arch/mips/boot/Makefile index 094bc84765a3..e39a08edcaaa 100644 --- a/arch/mips/boot/Makefile +++ b/arch/mips/boot/Makefile @@ -28,7 +28,7 @@ VMLINUX = vmlinux all: vmlinux.ecoff vmlinux.srec vmlinux.ecoff: $(obj)/elf2ecoff $(VMLINUX) - $(obj)/elf2ecoff $(VMLINUX) vmlinux.ecoff $(E2EFLAGS) + $(obj)/elf2ecoff $(VMLINUX) $(obj)/vmlinux.ecoff $(E2EFLAGS) $(obj)/elf2ecoff: $(obj)/elf2ecoff.c $(HOSTCC) -o $@ $^ |