aboutsummaryrefslogtreecommitdiffstats
path: root/arch/Kconfig
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-09-07 08:19:51 +0200
committerIngo Molnar <mingo@elte.hu>2009-09-07 08:19:51 +0200
commita1922ed661ab2c1637d0b10cde933bd9cd33d965 (patch)
tree0f1777542b385ebefd30b3586d830fd8ed6fda5b /arch/Kconfig
parent75e33751ca8bbb72dd6f1a74d2810ddc8cbe4bdf (diff)
parentd28daf923ac5e4a0d7cecebae56f3e339189366b (diff)
downloadkernel_samsung_espresso10-a1922ed661ab2c1637d0b10cde933bd9cd33d965.zip
kernel_samsung_espresso10-a1922ed661ab2c1637d0b10cde933bd9cd33d965.tar.gz
kernel_samsung_espresso10-a1922ed661ab2c1637d0b10cde933bd9cd33d965.tar.bz2
Merge branch 'tracing/core' into tracing/hw-breakpoints
Conflicts: arch/Kconfig kernel/trace/trace.h Merge reason: resolve the conflicts, plus adopt to the new ring-buffer APIs. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/Kconfig')
-rw-r--r--arch/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/Kconfig b/arch/Kconfig
index 1adf2d0..c72f18f 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -116,3 +116,5 @@ config HAVE_DEFAULT_NO_SPIN_MUTEXES
config HAVE_HW_BREAKPOINT
bool
+
+source "kernel/gcov/Kconfig"