aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-08-18 12:00:14 -0500
committerMark Brown <broonie@linaro.org>2014-08-18 12:00:14 -0500
commit67e22faa886d57d9113538cc4cd54f4ca1a6db39 (patch)
tree7b2b9f4ade9fa3f17cd7bf588a6b371752f1fe1f
parent862aa7107a86ad0f8597453625d6869b39b757dc (diff)
parentc01e5d4a6191e485b70eb3f13a10858db7d8990e (diff)
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
-rw-r--r--linaro/configs/linaro-base.conf1
1 files changed, 1 insertions, 0 deletions
diff --git a/linaro/configs/linaro-base.conf b/linaro/configs/linaro-base.conf
index 0620d5ec3e1c..bbd0f160398f 100644
--- a/linaro/configs/linaro-base.conf
+++ b/linaro/configs/linaro-base.conf
@@ -115,3 +115,4 @@ CONFIG_SECURITY_SELINUX=y
CONFIG_EXT4_FS_SECURITY=y
CONFIG_BLK_DEV_LOOP=y
CONFIG_DEBUG_INFO=y
+CONFIG_FANOTIFY=y