[SCSI] don't build scsi_dma_{map,unmap} for !HAS_DMA
authorCornelia Huck <cornelia.huck@de.ibm.com>
Mon, 9 Jul 2007 18:59:59 +0000 (11:59 -0700)
committerJames Bottomley <jejb@mulgrave.localdomain>
Sun, 15 Jul 2007 00:28:10 +0000 (19:28 -0500)
commit7689e82efdb636e8a076a1293b977bce313110c5
tree3d8702ff24a205db7670ad5425e3a35fe45b0f00
parent6d877688ef411313c94aa3c83c7473fbec6db32c
[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>
drivers/scsi/Kconfig
drivers/scsi/Makefile
drivers/scsi/scsi_lib.c
drivers/scsi/scsi_lib_dma.c [new file with mode: 0644]