Merge branch 'locks' of git://linux-nfs.org/~bfields/linux

[sfrench/cifs-2.6.git] / arch / sparc / Kconfig

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index c0f4ba109daab7ef41e302d46de488fa29aa622b..51008a2ba5b4aa9ade4a881b4bccbb37c32c08fb 100644 (file)
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -63,6 +63,7 @@ config NR_CPUS
 config SPARC
        bool
        default y
+       select HAVE_OPROFILE
 
 # Identify this as a Sparc32 build
 config SPARC32
@@ -320,12 +321,6 @@ endmenu
 
 source "fs/Kconfig"
 
-menu "Instrumentation Support"
-
-source "arch/sparc/oprofile/Kconfig"
-
-endmenu
-
 source "arch/sparc/Kconfig.debug"
 
 source "security/Kconfig"