summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Axboe <jaxboe@fusionio.com>2011-01-19 11:07:28 -0700
committerJens Axboe <jaxboe@fusionio.com>2011-01-19 11:07:28 -0700
commit3be8007107a6e4bad3f1b7ea9ea80b51a2dddfc4 (patch)
tree79f47403b2fbf3332aa303ae1b5e6055fd8161a6
parent034ca7e4b63ff63dee43770c20d0860903705cf3 (diff)
downloadfio-3be8007107a6e4bad3f1b7ea9ea80b51a2dddfc4.tar.gz
fio-3be8007107a6e4bad3f1b7ea9ea80b51a2dddfc4.tar.bz2
Fix merge error hiding mmap ioengine under Windows build
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
-rw-r--r--options.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/options.c b/options.c
index 163e5089..67d0d2dd 100644
--- a/options.c
+++ b/options.c
@@ -946,12 +946,12 @@ static struct fio_option options[FIO_MAX_OPTS] = {
#endif
#ifdef FIO_HAVE_WINDOWSAIO
{ .ival = "windowsaio",
- .help = "Windows native asynchronous IO"
+ .help = "Windows native asynchronous IO"
},
+#endif
{ .ival = "mmap",
.help = "Memory mapped IO"
},
-#endif
#ifdef FIO_HAVE_SPLICE
{ .ival = "splice",
.help = "splice/vmsplice based IO",