diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-02-21 16:42:50 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-02-21 16:42:50 -0500 |
| commit | 22b61a11fd4e6d7a48d694ce350331bebc0394ed (patch) | |
| tree | f4be46c8154f5094c248fcd9fdf644b236f591b3 /drivers/scsi | |
| parent | 423145a5d4def58cff760809d48cfb21316d59a9 (diff) | |
| parent | fa4e998999322bc1b11d2c8b19b9fa2016fd1548 (diff) | |
Merge branch 'dma' into devel
Conflicts:
arch/arm/plat-mxc/dma-mx1-mx2.c
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/arm/cumana_2.c | 3 | ||||
| -rw-r--r-- | drivers/scsi/arm/eesox.c | 3 | ||||
| -rw-r--r-- | drivers/scsi/arm/powertec.c | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/drivers/scsi/arm/cumana_2.c b/drivers/scsi/arm/cumana_2.c index 68a64123af8f..8ee01b907332 100644 --- a/drivers/scsi/arm/cumana_2.c +++ b/drivers/scsi/arm/cumana_2.c | |||
| @@ -390,7 +390,8 @@ static struct scsi_host_template cumanascsi2_template = { | |||
| 390 | .eh_abort_handler = fas216_eh_abort, | 390 | .eh_abort_handler = fas216_eh_abort, |
| 391 | .can_queue = 1, | 391 | .can_queue = 1, |
| 392 | .this_id = 7, | 392 | .this_id = 7, |
| 393 | .sg_tablesize = SG_ALL, | 393 | .sg_tablesize = SCSI_MAX_SG_CHAIN_SEGMENTS, |
| 394 | .dma_boundary = IOMD_DMA_BOUNDARY, | ||
| 394 | .cmd_per_lun = 1, | 395 | .cmd_per_lun = 1, |
| 395 | .use_clustering = DISABLE_CLUSTERING, | 396 | .use_clustering = DISABLE_CLUSTERING, |
| 396 | .proc_name = "cumanascsi2", | 397 | .proc_name = "cumanascsi2", |
diff --git a/drivers/scsi/arm/eesox.c b/drivers/scsi/arm/eesox.c index bb2477b3fb0b..d8435132f461 100644 --- a/drivers/scsi/arm/eesox.c +++ b/drivers/scsi/arm/eesox.c | |||
| @@ -508,7 +508,8 @@ static struct scsi_host_template eesox_template = { | |||
| 508 | .eh_abort_handler = fas216_eh_abort, | 508 | .eh_abort_handler = fas216_eh_abort, |
| 509 | .can_queue = 1, | 509 | .can_queue = 1, |
| 510 | .this_id = 7, | 510 | .this_id = 7, |
| 511 | .sg_tablesize = SG_ALL, | 511 | .sg_tablesize = SCSI_MAX_SG_CHAIN_SEGMENTS, |
| 512 | .dma_boundary = IOMD_DMA_BOUNDARY, | ||
| 512 | .cmd_per_lun = 1, | 513 | .cmd_per_lun = 1, |
| 513 | .use_clustering = DISABLE_CLUSTERING, | 514 | .use_clustering = DISABLE_CLUSTERING, |
| 514 | .proc_name = "eesox", | 515 | .proc_name = "eesox", |
diff --git a/drivers/scsi/arm/powertec.c b/drivers/scsi/arm/powertec.c index d9a546d1917c..e2297b4c1b9e 100644 --- a/drivers/scsi/arm/powertec.c +++ b/drivers/scsi/arm/powertec.c | |||
| @@ -302,7 +302,8 @@ static struct scsi_host_template powertecscsi_template = { | |||
| 302 | 302 | ||
| 303 | .can_queue = 8, | 303 | .can_queue = 8, |
| 304 | .this_id = 7, | 304 | .this_id = 7, |
| 305 | .sg_tablesize = SG_ALL, | 305 | .sg_tablesize = SCSI_MAX_SG_CHAIN_SEGMENTS, |
| 306 | .dma_boundary = IOMD_DMA_BOUNDARY, | ||
| 306 | .cmd_per_lun = 2, | 307 | .cmd_per_lun = 2, |
| 307 | .use_clustering = ENABLE_CLUSTERING, | 308 | .use_clustering = ENABLE_CLUSTERING, |
| 308 | .proc_name = "powertec", | 309 | .proc_name = "powertec", |