diff options
author | Jens Axboe <jens.axboe@oracle.com> | 2009-05-22 14:25:34 -0400 |
---|---|---|
committer | Jens Axboe <jens.axboe@oracle.com> | 2009-05-22 14:25:34 -0400 |
commit | e4b636366c00738b9609cda307014d71b1225b7f (patch) | |
tree | 760b67b3624eda62e943e48ce93635c30a5b47bf /arch/avr32/Makefile | |
parent | b9ed7252d219c1c663944bf03846eabb515dbe75 (diff) | |
parent | 279e677faa775ad16e75c32e1bf4a37f8158bc61 (diff) |
Merge branch 'master' into for-2.6.31
Conflicts:
drivers/block/hd.c
drivers/block/mg_disk.c
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
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 |