projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
[cascardo/linux.git]
/
arch
/
sparc
/
Kconfig
diff --git
a/arch/sparc/Kconfig
b/arch/sparc/Kconfig
index
9d327ec
..
527adc8
100644
(file)
--- a/
arch/sparc/Kconfig
+++ b/
arch/sparc/Kconfig
@@
-320,12
+320,7
@@
endmenu
source "fs/Kconfig"
-menu "Instrumentation Support"
- depends on EXPERIMENTAL
-
-source "arch/sparc/oprofile/Kconfig"
-
-endmenu
+source "kernel/Kconfig.instrumentation"
source "arch/sparc/Kconfig.debug"