diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
| commit | 24bfb00123e82a2e70bd115277d922438813515b (patch) | |
| tree | 27328b8a5718e16d64e2d101f4b7ddcad5930aed /init | |
| parent | c6135234550ed89a6fd0e8cb229633967e41d649 (diff) | |
| parent | 3f00d3e8fb963968a922d821a9a53b503b687e81 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig index 3dcbd5bfd4..ea097e0a9c 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 | ||