diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-05-18 01:37:44 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-05-18 01:37:49 -0400 |
commit | dc3f81b129b5439ba7bac265bbc6a51a39275dae (patch) | |
tree | 216030731d911249496d2e97206cd61431e31c89 /arch/avr32/Makefile | |
parent | d2517a49d55536b38c7a87e5289550cfedaa4dcc (diff) | |
parent | 1406de8e11eb043681297adf86d6892ff8efc27a (diff) |
Merge commit 'v2.6.30-rc6' into perfcounters/core
Merge reason: this branch was on an -rc4 base, merge it up to -rc6
to get the latest upstream fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/avr32/Makefile')
-rw-r--r-- | arch/avr32/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/avr32/Makefile b/arch/avr32/Makefile index 0b97e14f73f6..c21a3290d542 100644 --- a/arch/avr32/Makefile +++ b/arch/avr32/Makefile | |||
@@ -43,8 +43,6 @@ core-y += arch/avr32/mm/ | |||
43 | drivers-$(CONFIG_OPROFILE) += arch/avr32/oprofile/ | 43 | drivers-$(CONFIG_OPROFILE) += arch/avr32/oprofile/ |
44 | libs-y += arch/avr32/lib/ | 44 | libs-y += arch/avr32/lib/ |
45 | 45 | ||
46 | CLEAN_FILES += include/asm-avr32/.arch include/asm-avr32/arch | ||
47 | |||
48 | BOOT_TARGETS := vmlinux.elf vmlinux.bin uImage uImage.srec | 46 | BOOT_TARGETS := vmlinux.elf vmlinux.bin uImage uImage.srec |
49 | 47 | ||
50 | .PHONY: $(BOOT_TARGETS) install | 48 | .PHONY: $(BOOT_TARGETS) install |