diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-22 03:08:14 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-22 03:08:14 -0400 |
| commit | debfcaf93ed500a051489db6646d71f29fe86a68 (patch) | |
| tree | 7ba189b6dd654022ecc655b68e3c0a4573627706 /arch/arm/Kconfig | |
| parent | 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff) | |
| parent | 81520a1b0649d0701205b818714a8c1e1cfbbb5b (diff) | |
Merge branch 'tracing/ftrace' into tracing/urgent
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index df39d20f7425..600733426ae0 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -16,8 +16,8 @@ config ARM | |||
| 16 | select HAVE_ARCH_KGDB | 16 | select HAVE_ARCH_KGDB |
| 17 | select HAVE_KPROBES if (!XIP_KERNEL) | 17 | select HAVE_KPROBES if (!XIP_KERNEL) |
| 18 | select HAVE_KRETPROBES if (HAVE_KPROBES) | 18 | select HAVE_KRETPROBES if (HAVE_KPROBES) |
| 19 | select HAVE_FTRACE if (!XIP_KERNEL) | 19 | select HAVE_FUNCTION_TRACER if (!XIP_KERNEL) |
| 20 | select HAVE_DYNAMIC_FTRACE if (HAVE_FTRACE) | 20 | select HAVE_DYNAMIC_FTRACE if (HAVE_FUNCTION_TRACER) |
| 21 | select HAVE_GENERIC_DMA_COHERENT | 21 | select HAVE_GENERIC_DMA_COHERENT |
| 22 | help | 22 | help |
| 23 | The ARM series is a line of low-power-consumption RISC chip designs | 23 | The ARM series is a line of low-power-consumption RISC chip designs |