diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-12-17 16:53:07 +0100 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-12-17 16:53:07 +0100 |
| commit | cb5473205206c7f14cbb1e747f28ec75b48826e2 (patch) | |
| tree | 8f4808d60917100b18a10b05230f7638a0a9bbcc /disk/Makefile | |
| parent | baf449fc5ff96f071bb0e3789fd3265f6d4fd9a0 (diff) | |
| parent | 92c78a3bbcb2ce508b4bf1c4a1e0940406a024bb (diff) | |
Merge branch 'fixes' into cleanups
Conflicts:
board/atmel/atngw100/atngw100.c
board/atmel/atstk1000/atstk1000.c
cpu/at32ap/at32ap700x/gpio.c
include/asm-avr32/arch-at32ap700x/clk.h
include/configs/atngw100.h
include/configs/atstk1002.h
include/configs/atstk1003.h
include/configs/atstk1004.h
include/configs/atstk1006.h
include/configs/favr-32-ezkit.h
include/configs/hammerhead.h
include/configs/mimc200.h
Diffstat (limited to 'disk/Makefile')
| -rw-r--r-- | disk/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/disk/Makefile b/disk/Makefile index f19d18d89..c4791451c 100644 --- a/disk/Makefile +++ b/disk/Makefile @@ -32,6 +32,7 @@ COBJS-y += part_mac.o COBJS-y += part_dos.o COBJS-y += part_iso.o COBJS-y += part_amiga.o +COBJS-y += part_efi.o COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c) |