Merge branch 'master' of git://git.denx.de/u-boot-arm

[oweals/u-boot.git] / arch / arm / include / asm / arch-mxs / dma.h

diff --git a/arch/arm/include/asm/arch-mxs/dma.h b/arch/arm/include/asm/arch-mxs/dma.h
index 4a1820bdee3244b04f4f3cf375e065ac55f24a65..a0a0ea5010747e667af841c17084341d35beccb9 100644 (file)
--- a/arch/arm/include/asm/arch-mxs/dma.h
+++ b/arch/arm/include/asm/arch-mxs/dma.h
@@ -27,6 +27,7 @@
 #define __DMA_H__
 
 #include <linux/list.h>
+#include <linux/compiler.h>
 
 #ifndef        CONFIG_ARCH_DMA_PIO_WORDS
 #define        DMA_PIO_WORDS           15
@@ -109,7 +110,7 @@ struct mxs_dma_desc {
        dma_addr_t              address;
        void                    *buffer;
        struct list_head        node;
-};
+} __aligned(MXS_DMA_ALIGNMENT);
 
 /**
  * MXS DMA channel