Commit 13391c60 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents f8ad8187 4f6543f2

drivers/crypto/marvell/cesa/cesa.h

+2 −2
Original line number Diff line number Diff line
@@ -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;