diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-07 05:17:13 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-07 05:17:34 -0400 |
| commit | 44347d947f628060b92449702071bfe1d31dfb75 (patch) | |
| tree | c6ed74610d5b3295df4296659f80f5feb94b28cc /arch/avr32/Makefile | |
| parent | d94fc523f3c35bd8013f04827e94756cbc0212f4 (diff) | |
| parent | 413f81eba35d6ede9289b0c8a920c013a84fac71 (diff) | |
Merge branch 'linus' into tracing/core
Merge reason: tracing/core was on a .30-rc1 base and was missing out on
on a handful of tracing fixes present in .30-rc5-almost.
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 |