diff options
| author | Tom Rini <trini@ti.com> | 2013-05-14 11:45:41 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-05-14 11:45:41 -0400 |
| commit | 805fa87f6d2366e2193f3d9eb1f793ad41ae1430 (patch) | |
| tree | 743278b9e271dc84670680a466ef2ebaabcbbce9 /arch/blackfin/include/asm/dma.h | |
| parent | a661b99dbc35e725f229a7b8e189ca21304ba026 (diff) | |
| parent | da34aae5fba36c1f1989fdd41fffa723f300eaad (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-blackfin into powerpc-eldk53-warning-fixes
Diffstat (limited to 'arch/blackfin/include/asm/dma.h')
| -rw-r--r-- | arch/blackfin/include/asm/dma.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/arch/blackfin/include/asm/dma.h b/arch/blackfin/include/asm/dma.h index ef1db6e99c..8a7c07933e 100644 --- a/arch/blackfin/include/asm/dma.h +++ b/arch/blackfin/include/asm/dma.h @@ -17,21 +17,21 @@ struct dmasg_large { void *next_desc_addr; - unsigned long start_addr; - unsigned short cfg; - unsigned short x_count; - short x_modify; - unsigned short y_count; - short y_modify; + u32 start_addr; + u16 cfg; + u16 x_count; + s16 x_modify; + u16 y_count; + s16 y_modify; } __attribute__((packed)); struct dmasg { - unsigned long start_addr; - unsigned short cfg; - unsigned short x_count; - short x_modify; - unsigned short y_count; - short y_modify; + u32 start_addr; + u16 cfg; + u16 x_count; + s16 x_modify; + u16 y_count; + s16 y_modify; } __attribute__((packed)); struct dma_register { |