Merge branch 'topic/core' into for-linus

 */

 */

struct dma_slave_config {

struct dma_slave_config {

	enum dma_transfer_direction direction;

	enum dma_transfer_direction direction;

	dma_addr_t src_addr;

	phys_addr_t src_addr;

	dma_addr_t dst_addr;

	phys_addr_t dst_addr;

	enum dma_slave_buswidth src_addr_width;

	enum dma_slave_buswidth src_addr_width;

	enum dma_slave_buswidth dst_addr_width;

	enum dma_slave_buswidth dst_addr_width;

	u32 src_maxburst;

	u32 src_maxburst;