From b1d9f6fedbe02399dee0fe313fe361b0454998be Mon Sep 17 00:00:00 2001
From: Mike Rapoport <mike@compulab.co.il>
Date: Mon, 6 Apr 2009 19:00:57 -0700
Subject: [PATCH] --- yaml --- r: 142570 b: refs/heads/master c:
 96a6d9aa096aeb758273a8fb6388c279ecef5e7e h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/spi/spi_imx.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 23c86b590873..a630d7ba2e23 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ad0ba91d47ff539fe114875bd0a319fba29c9b5
+refs/heads/master: 96a6d9aa096aeb758273a8fb6388c279ecef5e7e
diff --git a/trunk/drivers/spi/spi_imx.c b/trunk/drivers/spi/spi_imx.c
index 014af69fc1bb..0671aeef5792 100644
--- a/trunk/drivers/spi/spi_imx.c
+++ b/trunk/drivers/spi/spi_imx.c
@@ -186,6 +186,7 @@
 #define QUEUE_STOPPED			(1)
 
 #define IS_DMA_ALIGNED(x) 		(((u32)(x) & 0x03) == 0)
+#define DMA_ALIGNMENT			4
 /*-------------------------------------------------------------------------*/
 
 
@@ -1482,6 +1483,7 @@ static int __init spi_imx_probe(struct platform_device *pdev)
 
 	master->bus_num = pdev->id;
 	master->num_chipselect = platform_info->num_chipselect;
+	master->dma_alignment = DMA_ALIGNMENT;
 	master->cleanup = cleanup;
 	master->setup = setup;
 	master->transfer = transfer;