diff options
| author | Cornelia Huck <cornelia.huck@de.ibm.com> | 2007-07-09 11:59:59 -0700 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.localdomain> | 2007-07-14 19:28:10 -0500 |
| commit | 7689e82efdb636e8a076a1293b977bce313110c5 (patch) | |
| tree | 3d8702ff24a205db7670ad5425e3a35fe45b0f00 /drivers/scsi/Makefile | |
| parent | 6d877688ef411313c94aa3c83c7473fbec6db32c (diff) | |
| download | linux-7689e82efdb636e8a076a1293b977bce313110c5.tar.bz2 | |
[SCSI] don't build scsi_dma_{map,unmap} for !HAS_DMA
With
dma-mapping-prevent-dma-dependent-code-from-linking-on.patch
scsi fails to build on !HAS_DMA architectures:
drivers/built-in.o(.text+0x20af6): In function `scsi_dma_map':
: undefined reference to `dma_map_sg'
drivers/built-in.o(.text+0x20b5c): In function `scsi_dma_unmap':
: undefined reference to `dma_unmap_sg'
I split those functions out into a new file. Builds on s390 and i386.
Move scsi_dma_{map,unmap} into scsi_lib_dma.c which is only build if
HAS_DMA is set.
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: James Bottomley <James.Bottomley@SteelEye.com>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/Makefile')
| -rw-r--r-- | drivers/scsi/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile index cbc2e2ba5412..0f8689557158 100644 --- a/drivers/scsi/Makefile +++ b/drivers/scsi/Makefile @@ -148,9 +148,9 @@ obj-$(CONFIG_SCSI_DEBUG) += scsi_debug.o obj-$(CONFIG_SCSI_WAIT_SCAN) += scsi_wait_scan.o scsi_mod-y += scsi.o hosts.o scsi_ioctl.o constants.o \ - scsicam.o scsi_error.o scsi_lib.o \ - scsi_scan.o scsi_sysfs.o \ - scsi_devinfo.o + scsicam.o scsi_error.o scsi_lib.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 scsi_mod-$(CONFIG_SYSCTL) += scsi_sysctl.o scsi_mod-$(CONFIG_SCSI_PROC_FS) += scsi_proc.o |