diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-11-26 05:28:11 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-11-26 05:28:11 -0500 |
| commit | 83cf1eecfe9afee99d6b86f963187acd414c019d (patch) | |
| tree | 4381bdcc45d81c8c3713630cae9660d770885d96 /arch/arm/Kconfig | |
| parent | f1690d17d2c7afa2a2079e3c91eb2bca8c1c5ecd (diff) | |
| parent | 0e341af835fdf553820a1fa98341b93ab32ce466 (diff) | |
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/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index c8fa1443e2c1..49778bb43782 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -14,6 +14,7 @@ config ARM | |||
| 14 | select HAVE_FUNCTION_TRACER if (!XIP_KERNEL) | 14 | select HAVE_FUNCTION_TRACER if (!XIP_KERNEL) |
| 15 | select HAVE_FTRACE_MCOUNT_RECORD if (!XIP_KERNEL) | 15 | select HAVE_FTRACE_MCOUNT_RECORD if (!XIP_KERNEL) |
| 16 | select HAVE_DYNAMIC_FTRACE if (!XIP_KERNEL) | 16 | select HAVE_DYNAMIC_FTRACE if (!XIP_KERNEL) |
| 17 | select HAVE_FUNCTION_GRAPH_TRACER if (!THUMB2_KERNEL) | ||
| 17 | select HAVE_GENERIC_DMA_COHERENT | 18 | select HAVE_GENERIC_DMA_COHERENT |
| 18 | select HAVE_KERNEL_GZIP | 19 | select HAVE_KERNEL_GZIP |
| 19 | select HAVE_KERNEL_LZO | 20 | select HAVE_KERNEL_LZO |