diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-27 11:46:49 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-27 11:46:49 -0500 |
| commit | 4fa639123d9e6e8dfaa3d116368f4b2478da31af (patch) | |
| tree | 50c42e2102a542891a15b5011e48fbde14149baf /block/Kconfig | |
| parent | df5b89b323b922f56650b4b4d7c41899b937cf19 (diff) | |
| parent | ae36b883d29e53b6083ed3d1d44f254cee7507d3 (diff) | |
Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block
* 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block:
[PATCH] Don't make debugfs depend on DEBUG_KERNEL
[PATCH] Fix blktrace compile with sysfs not defined
[PATCH] unused label in drivers/block/cciss.
[BLOCK] increase size of disk stat counters
[PATCH] blk_execute_rq_nowait-speedup
[PATCH] ide-cd: quiet down GPCMD_READ_CDVD_CAPACITY failure
[BLOCK] ll_rw_blk: kmalloc -> kzalloc conversion
[PATCH] kzalloc() conversion in drivers/block
[PATCH] update max_sectors documentation
Diffstat (limited to 'block/Kconfig')
| -rw-r--r-- | block/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/block/Kconfig b/block/Kconfig index 43ca070dc0f8..5536839886ff 100644 --- a/block/Kconfig +++ b/block/Kconfig | |||
| @@ -13,6 +13,7 @@ config LBD | |||
| 13 | 13 | ||
| 14 | config BLK_DEV_IO_TRACE | 14 | config BLK_DEV_IO_TRACE |
| 15 | bool "Support for tracing block io actions" | 15 | bool "Support for tracing block io actions" |
| 16 | depends on SYSFS | ||
| 16 | select RELAY | 17 | select RELAY |
| 17 | select DEBUG_FS | 18 | select DEBUG_FS |
| 18 | help | 19 | help |