diff options
| author | Avik Sil <avik.sil@linaro.org> | 2011-03-31 11:06:38 +0000 |
|---|---|---|
| committer | Avik Sil <avik.sil@linaro.org> | 2011-03-31 11:06:38 +0000 |
| commit | ebb688e3183bd5891312bdb8f4e2f520d70b36b6 (patch) | |
| tree | c30d1abefaccc8cd1baa4944aae3348668e13bde /arch/arm/Kconfig.debug | |
| parent | 8061f3a885ec3538bf405ff3957c205b1ab2aae4 (diff) | |
| parent | b2afcd30fff4c24290a63a2497de301864d9726d (diff) | |
Merge remote branch 'lttng/2.6.38-lttng-0.247'
Conflicts:
arch/arm/kernel/traps.c
arch/arm/mach-omap2/clock34xx.c
arch/arm/mach-omap2/pm34xx.c
Diffstat (limited to 'arch/arm/Kconfig.debug')
| -rw-r--r-- | arch/arm/Kconfig.debug | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 494224a9b45..23f8c4b764e 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -147,4 +147,8 @@ config DEBUG_S3C_UART The uncompressor code port configuration is now handled by CONFIG_S3C_LOWLEVEL_UART_PORT. +config DEBUG_TRACE_CLOCK + bool "Debug trace clock" + depends on HAVE_TRACE_CLOCK + endmenu |