git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerp...
[sfrench/cifs-2.6.git]
/
arch
/
m32r
/
Kconfig
diff --git
a/arch/m32r/Kconfig
b/arch/m32r/Kconfig
index bd5fe76401f18dea117b6042362fc70a759a4a6f..ab9a264cb1947cb6a938c523e677f4c64873b72e 100644
(file)
--- a/
arch/m32r/Kconfig
+++ b/
arch/m32r/Kconfig
@@
-426,7
+426,7
@@
source "drivers/Kconfig"
source "fs/Kconfig"
-source "
arch/m32r/oprofile/Kconfig
"
+source "
kernel/Kconfig.instrumentation
"
source "arch/m32r/Kconfig.debug"