aboutsummaryrefslogtreecommitdiff
path: root/linaro
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-08-18 11:59:38 -0500
committerMark Brown <broonie@linaro.org>2014-08-18 11:59:38 -0500
commitc01e5d4a6191e485b70eb3f13a10858db7d8990e (patch)
tree2eb2d7809006573ac7f72695f41a7d6066079b0a /linaro
parent5b70260e8f6bf80def50b2126e2ded2cb8e32012 (diff)
parent3b947a25956554edf17da7d2cdce0828114cee2a (diff)
Merge remote-tracking branch 'lsk/v3.10/topic/configs' into linux-linaro-lsk
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