diff options
author | Cornelia Huck <cornelia.huck@de.ibm.com> | 2007-07-09 14:59:59 -0400 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.localdomain> | 2007-07-14 20:28:10 -0400 |
commit | 7689e82efdb636e8a076a1293b977bce313110c5 (patch) | |
tree | 3d8702ff24a205db7670ad5425e3a35fe45b0f00 /drivers/scsi/Kconfig | |
parent | 6d877688ef411313c94aa3c83c7473fbec6db32c (diff) |
[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/Kconfig')
-rw-r--r-- | drivers/scsi/Kconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index 874cfee29358..6ac3873e4d73 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig | |||
@@ -10,6 +10,7 @@ config RAID_ATTRS | |||
10 | config SCSI | 10 | config SCSI |
11 | tristate "SCSI device support" | 11 | tristate "SCSI device support" |
12 | depends on BLOCK | 12 | depends on BLOCK |
13 | select SCSI_DMA if HAS_DMA | ||
13 | ---help--- | 14 | ---help--- |
14 | If you want to use a SCSI hard disk, SCSI tape drive, SCSI CD-ROM or | 15 | If you want to use a SCSI hard disk, SCSI tape drive, SCSI CD-ROM or |
15 | any other SCSI device under Linux, say Y and make sure that you know | 16 | any other SCSI device under Linux, say Y and make sure that you know |
@@ -29,6 +30,10 @@ config SCSI | |||
29 | However, do not compile this as a module if your root file system | 30 | However, do not compile this as a module if your root file system |
30 | (the one containing the directory /) is located on a SCSI device. | 31 | (the one containing the directory /) is located on a SCSI device. |
31 | 32 | ||
33 | config SCSI_DMA | ||
34 | bool | ||
35 | default n | ||
36 | |||
32 | config SCSI_TGT | 37 | config SCSI_TGT |
33 | tristate "SCSI target support" | 38 | tristate "SCSI target support" |
34 | depends on SCSI && EXPERIMENTAL | 39 | depends on SCSI && EXPERIMENTAL |