summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/Makefile
diff options
context:
space:
mode:
authorHannes Reinecke <hare@suse.de>2015-01-08 07:43:48 +0100
committerChristoph Hellwig <hch@lst.de>2015-01-09 15:44:31 +0100
commit2dd951ecd511756f405ae9324db87bb0159f6225 (patch)
tree61c8bdbc84bb31a4f1b1e39c12209778c591e655 /drivers/scsi/Makefile
parentscsi: use per-cpu buffer for formatting scsi_print_result() (diff)
downloadlinux-2dd951ecd511756f405ae9324db87bb0159f6225.tar.xz
linux-2dd951ecd511756f405ae9324db87bb0159f6225.zip
scsi: Conditionally compile in constants.c
Instead of having constants.c littered with ifdef statements we should be moving dummy functions into the header and condintionally compile in constants.c if selected. And update the Kconfig description to reflect the actual size difference. Suggested-by: Christoph Hellwig <hch@infradead.org> Tested-by: Robert Elliott <elliott@hp.com> Reviewed-by: Robert Elliott <elliott@hp.com> Signed-off-by: Hannes Reinecke <hare@suse.de> Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/scsi/Makefile')
-rw-r--r--drivers/scsi/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
index 447c2d24aafa..dee160a4f163 100644
--- a/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@ -159,9 +159,9 @@ obj-$(CONFIG_SCSI_OSD_INITIATOR) += osd/
# This goes last, so that "real" scsi devices probe earlier
obj-$(CONFIG_SCSI_DEBUG) += scsi_debug.o
-
-scsi_mod-y += scsi.o hosts.o scsi_ioctl.o constants.o \
+scsi_mod-y += scsi.o hosts.o scsi_ioctl.o \
scsicam.o scsi_error.o scsi_lib.o
+scsi_mod-$(CONFIG_SCSI_CONSTANTS) += constants.o
scsi_mod-$(CONFIG_SCSI_DMA) += scsi_lib_dma.o
scsi_mod-y += scsi_scan.o scsi_sysfs.o scsi_devinfo.o
scsi_mod-$(CONFIG_SCSI_NETLINK) += scsi_netlink.o