summaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-11-26 10:28:11 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-11-26 10:28:11 +0000
commit83cf1eecfe9afee99d6b86f963187acd414c019d (patch)
tree4381bdcc45d81c8c3713630cae9660d770885d96 /arch/arm/Kconfig
parentf1690d17d2c7afa2a2079e3c91eb2bca8c1c5ecd (diff)
parent0e341af835fdf553820a1fa98341b93ab32ce466 (diff)
downloadop-kernel-dev-83cf1eecfe9afee99d6b86f963187acd414c019d.zip
op-kernel-dev-83cf1eecfe9afee99d6b86f963187acd414c019d.tar.gz
Merge branch 'ftrace' of git://github.com/rabinv/linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index c8fa144..49778bb 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -14,6 +14,7 @@ config ARM
select HAVE_FUNCTION_TRACER if (!XIP_KERNEL)
select HAVE_FTRACE_MCOUNT_RECORD if (!XIP_KERNEL)
select HAVE_DYNAMIC_FTRACE if (!XIP_KERNEL)
+ select HAVE_FUNCTION_GRAPH_TRACER if (!THUMB2_KERNEL)
select HAVE_GENERIC_DMA_COHERENT
select HAVE_KERNEL_GZIP
select HAVE_KERNEL_LZO
OpenPOWER on IntegriCloud