aboutsummaryrefslogtreecommitdiff
path: root/drivers/mmc/card/block.c
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2015-03-16 15:58:26 +0800
committerAlex Shi <alex.shi@linaro.org>2015-03-16 15:58:26 +0800
commitbf73a688fc114a9ac4d19488db9406c4e71e3673 (patch)
treebb97eb6a0981d954ca2fdae0638f101a1b8d9af6 /drivers/mmc/card/block.c
parent438628396ca8a44f6b710a73612939bc54633d7c (diff)
parent3aa99367190965aa8881a187e484bec34e3a794f (diff)
downloadlinux-linaro-stable-bf73a688fc114a9ac4d19488db9406c4e71e3673.tar.gz
Merge branch 'linaro-android-3.14-lsk' of git://android.git.linaro.org/kernel/linaro-android into linux-linaro-lsk-v3.14-android
Diffstat (limited to 'drivers/mmc/card/block.c')
-rw-r--r--drivers/mmc/card/block.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index 79b47b69f92a..34a01879bb0f 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -36,7 +36,6 @@
#include <linux/compat.h>
#include <linux/pm_runtime.h>
-#define CREATE_TRACE_POINTS
#include <trace/events/mmc.h>
#include <linux/mmc/ioctl.h>