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 1755981ea0dc676e65b3f187d08cc27b6a64a395..21e6ad33dc5785665569abfa2c91ff66fc2dcf8e 100644 (file)
--- 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 \