aboutsummaryrefslogtreecommitdiff
path: root/linaro
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-08-18 11:59:58 -0500
committerMark Brown <broonie@linaro.org>2014-08-18 11:59:58 -0500
commit47f0a3acb179e7c798eca80161be69ecdf1f61ec (patch)
tree59cc284f49f9fbe7ba50557c0715ef77313da43c /linaro
parent5db0038f3a92fd7295d50c132033f14c8e0a80c3 (diff)
parent3c922482f4cc14f211bf678512a14b1cc62c49ed (diff)
Merge remote-tracking branch 'lsk/v3.14/topic/configs' into linux-linaro-lsk-v3.14
Diffstat (limited to 'linaro')
-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