From ea783f87082e59a511c4d720d287e0de9fccb1b5 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Fri, 5 Apr 2013 12:54:03 +0200 Subject: [PATCH] Fix merge error Fails link because we attempt to link in fio.o twice. Signed-off-by: Jens Axboe --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1755981e..21e6ad33 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ ifdef CONFIG_GFIO PROGS += gfio endif -SOURCE := gettime.c fio.c ioengines.c init.c stat.c log.c time.c filesetup.c \ +SOURCE := gettime.c ioengines.c init.c stat.c log.c time.c filesetup.c \ eta.c verify.c memory.c io_u.c parse.c mutex.c options.c \ lib/rbtree.c smalloc.c filehash.c profile.c debug.c lib/rand.c \ lib/num2str.c lib/ieee754.c $(wildcard crc/*.c) engines/cpu.c \ -- 2.25.1