diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-10 15:07:17 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-10 15:07:17 -0700 |
| commit | f8872f4cb4b58f06a27d0443668d12d49f3b5d31 (patch) | |
| tree | cf6bd1786e902f99ab764f8d8482f557cd8cf531 /drivers | |
| parent | 99baa75231e35aca41b9718adfb07f45ce40e84c (diff) | |
| parent | 574dc0abab6650c5371df15ac708e48fa25bed89 (diff) | |
| download | kernel_samsung_espresso10-f8872f4cb4b58f06a27d0443668d12d49f3b5d31.zip kernel_samsung_espresso10-f8872f4cb4b58f06a27d0443668d12d49f3b5d31.tar.gz kernel_samsung_espresso10-f8872f4cb4b58f06a27d0443668d12d49f3b5d31.tar.bz2 | |
Merge gregkh@master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/scsi/arm/Kconfig | 3 | ||||
| -rw-r--r-- | drivers/scsi/arm/scsi.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/scsi/arm/Kconfig b/drivers/scsi/arm/Kconfig index 06d7601..d006a8c 100644 --- a/drivers/scsi/arm/Kconfig +++ b/drivers/scsi/arm/Kconfig @@ -69,6 +69,7 @@ comment "The following drivers are not fully supported" config SCSI_CUMANA_1 tristate "CumanaSCSI I support (EXPERIMENTAL)" depends on ARCH_ACORN && EXPERIMENTAL && SCSI + select SCSI_SPI_ATTRS help This enables support for the Cumana SCSI I card. If you have an Acorn system with one of these, say Y. If unsure, say N. @@ -76,6 +77,7 @@ config SCSI_CUMANA_1 config SCSI_ECOSCSI tristate "EcoScsi support (EXPERIMENTAL)" depends on ARCH_ACORN && EXPERIMENTAL && (ARCH_ARC || ARCH_A5K) && SCSI + select SCSI_SPI_ATTRS help This enables support for the EcoSCSI card -- a small card that sits in the Econet socket. If you have an Acorn system with one of these, @@ -84,6 +86,7 @@ config SCSI_ECOSCSI config SCSI_OAK1 tristate "Oak SCSI support (EXPERIMENTAL)" depends on ARCH_ACORN && EXPERIMENTAL && SCSI + select SCSI_SPI_ATTRS help This enables support for the Oak SCSI card. If you have an Acorn system with one of these, say Y. If unsure, say N. diff --git a/drivers/scsi/arm/scsi.h b/drivers/scsi/arm/scsi.h index 6dd544a..8c2600f 100644 --- a/drivers/scsi/arm/scsi.h +++ b/drivers/scsi/arm/scsi.h @@ -74,7 +74,7 @@ static inline void init_SCp(Scsi_Cmnd *SCpnt) unsigned long len = 0; int buf; - SCpnt->SCp.buffer = (struct scatterlist *) SCpnt->buffer; + SCpnt->SCp.buffer = (struct scatterlist *) SCpnt->request_buffer; SCpnt->SCp.buffers_residual = SCpnt->use_sg - 1; SCpnt->SCp.ptr = (char *) (page_address(SCpnt->SCp.buffer->page) + |