summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2015-04-03 10:54:34 -0700
committerOlof Johansson <olof@lixom.net>2015-04-03 10:54:34 -0700
commitf28ae3ba10f3d9535289e7902293c52a494ed476 (patch)
tree5e46807da0cfab45e37275021f991a45f706fea2 /arch/arm/configs
parentcef9f501305480c2bff7259b5d260131aca4445a (diff)
parent76b21e300c508edf2fc9bf27e314821ee46fcfec (diff)
downloadblackbird-op-linux-f28ae3ba10f3d9535289e7902293c52a494ed476.tar.gz
blackbird-op-linux-f28ae3ba10f3d9535289e7902293c52a494ed476.zip
Merge tag 'mvebu-defconfig-4.1-2' of git://git.infradead.org/linux-mvebu into next/defconfig
Merge "ARM: mvebu: defconfig changes for v4.1 (round 2)" from Gregory Clement: mvebu defconfig changes for v4.1 (part #2) - add perf support in mvebu_v7_defconfig * tag 'mvebu-defconfig-4.1-2' of git://git.infradead.org/linux-mvebu: ARM: mvebu: Enable perf support in mvebu_v7_defconfig Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/mvebu_v7_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/mvebu_v7_defconfig b/arch/arm/configs/mvebu_v7_defconfig
index bb262f0880fd..cacc9f4055a7 100644
--- a/arch/arm/configs/mvebu_v7_defconfig
+++ b/arch/arm/configs/mvebu_v7_defconfig
@@ -5,6 +5,7 @@ CONFIG_HIGH_RES_TIMERS=y
CONFIG_LOG_BUF_SHIFT=14
CONFIG_BLK_DEV_INITRD=y
CONFIG_EXPERT=y
+CONFIG_PERF_EVENTS=y
CONFIG_SLAB=y
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
OpenPOWER on IntegriCloud