From 8b2eb664ce9dcba8b54ececf5e057470c47e57f7 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Fri, 24 Mar 2006 03:15:21 -0800 Subject: [PATCH] s390: merge cmb into dasdc dasd_cmd just implements three ioctls which are wrappers around functionality in the core kernel or other modules. When merging those into dasd_mod they just add 22 lines of code which is far less than the amount of code removed in the last two patches, and which doesn't spill into another 4k pages when build modular, while removing a 128lines module. Signed-off-by: Christoph Hellwig Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/s390/block/Kconfig | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'drivers/s390/block/Kconfig') diff --git a/drivers/s390/block/Kconfig b/drivers/s390/block/Kconfig index 6f50cc9..baf9cc3 100644 --- a/drivers/s390/block/Kconfig +++ b/drivers/s390/block/Kconfig @@ -55,14 +55,4 @@ config DASD_DIAG Disks under VM. If you are not running under VM or unsure what it is, say "N". -config DASD_CMB - tristate "Compatibility interface for DASD channel measurement blocks" - depends on DASD - help - This driver provides an additional interface to the channel measurement - facility, which is normally accessed though sysfs, with a set of - ioctl functions specific to the dasd driver. - This is only needed if you want to use applications written for - linux-2.4 dasd channel measurement facility interface. - endif -- cgit v1.1