diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-08-19 17:27:12 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-08-19 17:27:12 -0400 |
commit | d14b50cc60ca465290fcdb3b88e7d5fb684361ed (patch) | |
tree | c4a712123b94cd4c0ab4d8d9d87a7619e9bcb6ba /drivers/scsi | |
parent | a34b6fc04d58ad72fe0cc74cd448f4551bd2ebaf (diff) | |
parent | ef7d1b244fa6c94fb76d5f787b8629df64ea4046 (diff) | |
download | op-kernel-dev-d14b50cc60ca465290fcdb3b88e7d5fb684361ed.zip op-kernel-dev-d14b50cc60ca465290fcdb3b88e7d5fb684361ed.tar.gz |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/scsi')
-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) + |