diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 11:32:39 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 11:32:39 -0500 |
| commit | 333c47c847c90aaefde8b593054d9344106333b5 (patch) | |
| tree | a4aec7b18ffe8d8dd88e027e5e4d84b2d838fe8a /init/Kconfig | |
| parent | 8f0cb147b2fb12427bf6abef7fed2b604557a41e (diff) | |
| parent | c6ea2ba7b8acdb6c4a883b2d38607c8078dff4ee (diff) | |
Merge branch 'block-dir' of git://brick.kernel.dk/data/git/linux-2.6-block
Diffstat (limited to 'init/Kconfig')
| -rw-r--r-- | init/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig index 3dcbd5bfd498..ea097e0a9c02 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
| @@ -501,3 +501,7 @@ config STOP_MACHINE | |||
| 501 | help | 501 | help |
| 502 | Need stop_machine() primitive. | 502 | Need stop_machine() primitive. |
| 503 | endmenu | 503 | endmenu |
| 504 | |||
| 505 | menu "Block layer" | ||
| 506 | source "block/Kconfig" | ||
| 507 | endmenu | ||