From: Christoph Hellwig <hch@lst.de>
To: akpm@osdl.org, schwidefsky@de.ibm.com, arnd@arndb.de
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH 1/2] build dasd_cmd into dasd_mod
Date: Fri, 16 Dec 2005 15:31:20 +0100 [thread overview]
Message-ID: <20051216143120.GA19541@lst.de> (raw)
dasd_cmd is just a tiny compat shim. Building it into dasd_mod if
enabled makes fixing some ioctl mess a lot easier (see patch 2).
Signed-off-by: Christoph Hellwig <hch@lst.de>
Index: linux-2.6.15-rc5/drivers/s390/block/Kconfig
===================================================================
--- linux-2.6.15-rc5.orig/drivers/s390/block/Kconfig 2005-12-12 18:31:37.000000000 +0100
+++ linux-2.6.15-rc5/drivers/s390/block/Kconfig 2005-12-16 15:18:16.000000000 +0100
@@ -56,7 +56,7 @@
say "N".
config DASD_CMB
- tristate "Compatibility interface for DASD channel measurement blocks"
+ bool "Compatibility interface for DASD channel measurement blocks"
depends on DASD
help
This driver provides an additional interface to the channel measurement
Index: linux-2.6.15-rc5/drivers/s390/block/Makefile
===================================================================
--- linux-2.6.15-rc5.orig/drivers/s390/block/Makefile 2005-12-12 18:31:37.000000000 +0100
+++ linux-2.6.15-rc5/drivers/s390/block/Makefile 2005-12-16 15:19:24.000000000 +0100
@@ -2,16 +2,17 @@
# S/390 block devices
#
-dasd_eckd_mod-objs := dasd_eckd.o dasd_3990_erp.o dasd_9343_erp.o
-dasd_fba_mod-objs := dasd_fba.o dasd_3370_erp.o dasd_9336_erp.o
-dasd_diag_mod-objs := dasd_diag.o
-dasd_mod-objs := dasd.o dasd_ioctl.o dasd_proc.o dasd_devmap.o \
- dasd_genhd.o dasd_erp.o
+dasd_eckd_mod-y += dasd_eckd.o dasd_3990_erp.o dasd_9343_erp.o
+dasd_fba_mod-y += dasd_fba.o dasd_3370_erp.o dasd_9336_erp.o
+dasd_diag_mod-y += dasd_diag.o
+dasd_mod-y += dasd.o dasd_ioctl.o dasd_proc.o dasd_devmap.o \
+ dasd_genhd.o dasd_erp.o
+
+dasd_mod-$(CONFIG_DASD_CMB) += dasd_cmb.o
obj-$(CONFIG_DASD) += dasd_mod.o
obj-$(CONFIG_DASD_DIAG) += dasd_diag_mod.o
obj-$(CONFIG_DASD_ECKD) += dasd_eckd_mod.o
obj-$(CONFIG_DASD_FBA) += dasd_fba_mod.o
-obj-$(CONFIG_DASD_CMB) += dasd_cmb.o
obj-$(CONFIG_BLK_DEV_XPRAM) += xpram.o
obj-$(CONFIG_DCSSBLK) += dcssblk.o
reply other threads:[~2005-12-16 14:31 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20051216143120.GA19541@lst.de \
--to=hch@lst.de \
--cc=akpm@osdl.org \
--cc=arnd@arndb.de \
--cc=linux-kernel@vger.kernel.org \
--cc=schwidefsky@de.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox