Merge remote-tracking branch 'slave-dma/next'

diff --combined drivers/dma/idma64.h
index a52ad6bcf86a1fdf5ad564fef463142db03bba6c,dc687442418836d963d7cf70d5502c8369920d24..6b816878e5e7a79d9e4fb14f982e3aa21e3e34a2
--- 1/drivers/dma/idma64.h
--- 2/drivers/dma/idma64.h
+++ b/drivers/dma/idma64.h
@@@ -16,7 -16,7 +16,7 @@@
  #include <linux/spinlock.h>
  #include <linux/types.h>
  
 -#include <asm-generic/io-64-nonatomic-lo-hi.h>
 +#include <linux/io-64-nonatomic-lo-hi.h>
  
  #include "virt-dma.h"
  
@@@ -71,7 -71,7 +71,7 @@@
  #define IDMA64C_CFGH_SRC_PER(x)               ((x) << 0)      /* src peripheral */
  #define IDMA64C_CFGH_DST_PER(x)               ((x) << 4)      /* dst peripheral */
  #define IDMA64C_CFGH_RD_ISSUE_THD(x)  ((x) << 8)
- #define IDMA64C_CFGH_RW_ISSUE_THD(x)  ((x) << 18)
+ #define IDMA64C_CFGH_WR_ISSUE_THD(x)  ((x) << 18)
  
  /* Interrupt registers */