projects
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'from-linus' into upstream
[linux-2.6]
/
arch
/
powerpc
/
oprofile
/
Kconfig
diff --git
a/arch/powerpc/oprofile/Kconfig
b/arch/powerpc/oprofile/Kconfig
index
eb2dece
..
d03c0e5
100644
(file)
--- a/
arch/powerpc/oprofile/Kconfig
+++ b/
arch/powerpc/oprofile/Kconfig
@@
-1,4
+1,5
@@
config PROFILING
+ depends on !PPC_ISERIES
bool "Profiling support (EXPERIMENTAL)"
help
Say Y here to enable the extended profiling support mechanisms used