From ea5806559f92a3e7439bc7a4f2c0d04692e68931 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Mon, 22 Oct 2007 04:48:08 +0200
Subject: x86: add instrumentation menu

It seems commit 09cadedbdc01f1a4bea1f427d4fb4642eaa19da9 was incomplete
due to a clash with the x86 architecture merge.

Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 arch/i386/Kconfig | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'arch/i386/Kconfig')

diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index 5bed8be34ba..b4437ce0f97 100644
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -1270,6 +1270,8 @@ source "drivers/Kconfig"
 
 source "fs/Kconfig"
 
+source "kernel/Kconfig.instrumentation"
+
 source "arch/i386/Kconfig.debug"
 
 source "security/Kconfig"
-- 
cgit v1.2.3-18-g5258