Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fix from Herbert Xu: "Fix a regression in the cesa driver" * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: marvel/cesa - Fix tdma descriptor on 64-bit
This commit is contained in:
commit
13391c60da
@ -300,11 +300,11 @@ struct mv_cesa_tdma_desc {
|
||||
__le32 byte_cnt;
|
||||
union {
|
||||
__le32 src;
|
||||
dma_addr_t src_dma;
|
||||
u32 src_dma;
|
||||
};
|
||||
union {
|
||||
__le32 dst;
|
||||
dma_addr_t dst_dma;
|
||||
u32 dst_dma;
|
||||
};
|
||||
__le32 next_dma;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user