Merge branch 'omap-clock-fixes' of git://git.pwsan.com/linux-2.6

[linux-2.6-omap-h63xx.git] / block / Kconfig

diff --git a/block/Kconfig b/block/Kconfig
index 7cdaa1d722528372591377c60e3695e3ec9d0b16..e7d12782bcfb5eccb56aee532b8c27fa81706499 100644 (file)
--- a/block/Kconfig
+++ b/block/Kconfig
@@ -44,30 +44,6 @@ config LBD
 
          If unsure, say N.
 
-config BLK_DEV_IO_TRACE
-       bool "Support for tracing block io actions"
-       depends on SYSFS
-       select RELAY
-       select DEBUG_FS
-       select TRACEPOINTS
-       select TRACING
-       select STACKTRACE
-       help
-         Say Y here if you want to be able to trace the block layer actions
-         on a given queue. Tracing allows you to see any traffic happening
-         on a block device queue. For more information (and the userspace
-         support tools needed), fetch the blktrace tools from:
-
-         git://git.kernel.dk/blktrace.git
-
-         Tracing also is possible using the ftrace interface, e.g.:
-
-           echo 1 > /sys/block/sda/sda1/trace/enable
-           echo blk > /sys/kernel/debug/tracing/current_tracer
-           cat /sys/kernel/debug/tracing/trace_pipe
-
-         If unsure, say N.
-
 config BLK_DEV_BSG
        bool "Block layer SG support v4 (EXPERIMENTAL)"
        depends on EXPERIMENTAL