From: Jens Axboe <axboe@kernel.dk>
Date: Mon, 18 Feb 2013 19:09:28 +0000 (+0100)
Subject: Merge branch 'master' of ssh://brick.kernel.dk/data/git/fio
X-Git-Tag: fio-2.0.14~11
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=9e6eedcd3535a249b73db0551f15044360239de5;hp=033ace1e7965ebf215f6fba2102de5b716ebfede

Merge branch 'master' of ssh://brick.kernel.dk/data/git/fio
---

diff --git a/configure b/configure
index 8267e1c0..caaf30e0 100755
--- a/configure
+++ b/configure
@@ -227,9 +227,11 @@ CYGWIN*)
   ;;
 Android)
   output_sym "CONFIG_32BIT"
+  output_sym "CONFIG_LITTLE_ENDIAN"
   output_sym "CONFIG_SOCKLEN_T"
   output_sym "CONFIG_GETTIMEOFDAY"
   output_sym "CONFIG_CLOCK_GETTIME"
+  output_sym "CONFIG_CLOCK_MONOTONIC"
   echo "CC=$cc" >> $config_host_mak
   echo "EXTFLAGS=$CFLAGS -include config-host.h -DFIO_NO_HAVE_SHM_H -D_GNU_SOURCE" >> $config_host_mak
   exit 0