Merge branch 'dma' into devel

Conflicts:

	arch/arm/plat-mxc/dma-mx1-mx2.c

1 files changed, 2 insertions, 1 deletions

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 = {
         .eh_abort_handler               = fas216_eh_abort,
         .can_queue                      = 1,
         .this_id                        = 7,
-        .sg_tablesize                   = SG_ALL,
+        .sg_tablesize                   = SCSI_MAX_SG_CHAIN_SEGMENTS,
+        .dma_boundary                   = IOMD_DMA_BOUNDARY,
         .cmd_per_lun                    = 1,
         .use_clustering                 = DISABLE_CLUSTERING,
         .proc_name                      = "eesox",