X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=block%2FKconfig;h=9be0b56eaee19ee494d388f07cda821ffcc29ba0;hb=79907d89c397b8bc2e05b347ec94e928ea919d33;hp=e20fbde0875c6154fc8deaa96df64844f67c4bfc;hpb=2868ef7b39490e6b41c2c61cd9a5cd891e778b54;p=safe%2Fjmp%2Flinux-2.6

diff --git a/block/Kconfig b/block/Kconfig
index e20fbde..9be0b56 100644
--- a/block/Kconfig
+++ b/block/Kconfig
@@ -77,28 +77,6 @@ config BLK_DEV_INTEGRITY
 	T10/SCSI Data Integrity Field or the T13/ATA External Path
 	Protection.  If in doubt, say N.
 
-config BLK_CGROUP
-	bool
-	depends on CGROUPS
-	default n
-	---help---
-	Generic block IO controller cgroup interface. This is the common
-	cgroup interface which should be used by various IO controlling
-	policies.
-
-	Currently, CFQ IO scheduler uses it to recognize task groups and
-	control disk bandwidth allocation (proportional time slice allocation)
-	to such task groups.
-
-config DEBUG_BLK_CGROUP
-	bool
-	depends on BLK_CGROUP
-	default n
-	---help---
-	Enable some debugging help. Currently it stores the cgroup path
-	in the blk group which can be used by cfq for tracing various
-	group related activity.
-
 endif # BLOCK
 
 config BLOCK_COMPAT