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 branches 'release', 'cpuidle-2.6.25' and 'idle' into release
[sfrench/cifs-2.6.git]
/
arch
/
m68knommu
/
Kconfig
diff --git
a/arch/m68knommu/Kconfig
b/arch/m68knommu/Kconfig
index bd9213749ac27e228e6ac2dc07603bca7ef2f70a..6abbbb8aac5ebc733f7e4eb8cc8df3df6ef3959c 100644
(file)
--- a/
arch/m68knommu/Kconfig
+++ b/
arch/m68knommu/Kconfig
@@
-711,8
+711,6
@@
source "drivers/Kconfig"
source "fs/Kconfig"
-source "kernel/Kconfig.instrumentation"
-
source "arch/m68knommu/Kconfig.debug"
source "security/Kconfig"