diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-10 05:43:00 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-10 05:43:00 -0400 |
| commit | bac0c9103b31c3dd83ad9d731dd9834e2ba75e4f (patch) | |
| tree | 702dd6a7ce06d224d594c2293af546b11ac9f51b /arch/arm/Kconfig | |
| parent | 6329d3021bcfa9038621e6e917d98929421d8ec8 (diff) | |
| parent | 98a05ed4bd7774f533ab185fe0bf2fdc58292d7c (diff) | |
Merge branch 'tracing/ftrace' into auto-ftrace-next
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index b786e68914d4..3845e5c8a34f 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -14,6 +14,8 @@ config ARM | |||
| 14 | select HAVE_OPROFILE | 14 | select HAVE_OPROFILE |
| 15 | select HAVE_KPROBES if (!XIP_KERNEL) | 15 | select HAVE_KPROBES if (!XIP_KERNEL) |
| 16 | select HAVE_KRETPROBES if (HAVE_KPROBES) | 16 | select HAVE_KRETPROBES if (HAVE_KPROBES) |
| 17 | select HAVE_FTRACE if (!XIP_KERNEL) | ||
| 18 | select HAVE_DYNAMIC_FTRACE if (HAVE_FTRACE) | ||
| 17 | help | 19 | help |
| 18 | The ARM series is a line of low-power-consumption RISC chip designs | 20 | The ARM series is a line of low-power-consumption RISC chip designs |
| 19 | licensed by ARM Ltd and targeted at embedded applications and | 21 | licensed by ARM Ltd and targeted at embedded applications and |