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.23' into merge
[sfrench/cifs-2.6.git]
/
init
/
Kconfig
diff --git
a/init/Kconfig
b/init/Kconfig
index a9e99f8328ff485386faf668b61ee59c7a1fb085..d9d878a3bb46835e1f2c4301620975e05757ee1d 100644
(file)
--- a/
init/Kconfig
+++ b/
init/Kconfig
@@
-686,6
+686,4
@@
config STOP_MACHINE
Need stop_machine() primitive.
endmenu
-menu "Block layer"
source "block/Kconfig"
-endmenu