diff options
author | Jon Medhurst <tixy@linaro.org> | 2014-08-07 18:59:10 +0100 |
---|---|---|
committer | Jon Medhurst <tixy@linaro.org> | 2014-08-07 18:59:10 +0100 |
commit | 4e67150a30dd394f65fe98303c5b8ee0affc12af (patch) | |
tree | 3548d5698ee759855b4a1b531bbca50d4ba23554 | |
parent | 20548fbdff064e8f9564a07f6339a2caa7ccfb21 (diff) | |
parent | 892ee55f71cdbbe0d8a471dcc0758cf9620b9944 (diff) |
Merge branch 'master' into android
-rw-r--r-- | driver/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/driver/Makefile b/driver/Makefile index 2f86823..0dfa315 100644 --- a/driver/Makefile +++ b/driver/Makefile @@ -54,7 +54,7 @@ GATOR_TEST ?= 0 EXTRA_CFLAGS += -DGATOR_TEST=$(GATOR_TEST) # Should the original or new block_rq_complete API be used? -OLD_BLOCK_RQ_COMPLETE := $(shell grep -A3 block_rq_complete include/trace/events/block.h | grep nr_bytes > /dev/null; echo $$?) +OLD_BLOCK_RQ_COMPLETE := $(shell grep -A3 block_rq_complete $(srctree)/include/trace/events/block.h | grep nr_bytes -q; echo $$?) EXTRA_CFLAGS += -DOLD_BLOCK_RQ_COMPLETE=$(OLD_BLOCK_RQ_COMPLETE) gator-$(CONFIG_ARM) += gator_events_armv6.o \ |