diff --git a/[refs] b/[refs]
index b1e97e8e41a1..fb8aec6c18b3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c4f50183f90fb1fd99aa5941f01b90cd1b882d2e
+refs/heads/master: d69d59f49763e6bd047c591c6c1f84c8e13da931
diff --git a/trunk/arch/Kconfig b/trunk/arch/Kconfig
index 471e72dbaf8b..2e13aa261929 100644
--- a/trunk/arch/Kconfig
+++ b/trunk/arch/Kconfig
@@ -6,6 +6,8 @@ config OPROFILE
 	tristate "OProfile system profiling (EXPERIMENTAL)"
 	depends on PROFILING
 	depends on HAVE_OPROFILE
+	select TRACING
+	select RING_BUFFER
 	help
 	  OProfile is a profiling system capable of profiling the
 	  whole system, include the kernel, kernel modules, libraries,