From: Jens Axboe <axboe@kernel.dk>
Date: Fri, 5 Apr 2013 10:54:03 +0000 (+0200)
Subject: Fix merge error
X-Git-Tag: fio-2.1~57^2~15
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=ea783f87082e59a511c4d720d287e0de9fccb1b5;p=fio.git

Fix merge error

Fails link because we attempt to link in fio.o twice.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

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 \