diff options
Diffstat (limited to 'drivers/dma/apbh_dma.c')
| -rw-r--r-- | drivers/dma/apbh_dma.c | 5 | 
1 files changed, 3 insertions, 2 deletions
| diff --git a/drivers/dma/apbh_dma.c b/drivers/dma/apbh_dma.c index 0c1cd831e..510cb28ad 100644 --- a/drivers/dma/apbh_dma.c +++ b/drivers/dma/apbh_dma.c @@ -31,7 +31,8 @@  #include <asm/arch/clock.h>  #include <asm/arch/imx-regs.h>  #include <asm/arch/sys_proto.h> -#include <asm/arch/dma.h> +#include <asm/imx-common/dma.h> +#include <asm/imx-common/regs-apbh.h>  static struct mxs_dma_chan mxs_dma_channels[MXS_MAX_DMA_CHANNELS]; @@ -226,7 +227,7 @@ static int mxs_dma_reset(int channel)  #if defined(CONFIG_MX23)  	uint32_t setreg = (uint32_t)(&apbh_regs->hw_apbh_ctrl0_set);  	uint32_t offset = APBH_CTRL0_RESET_CHANNEL_OFFSET; -#elif defined(CONFIG_MX28) +#elif (defined(CONFIG_MX28) || defined(CONFIG_MX6))  	uint32_t setreg = (uint32_t)(&apbh_regs->hw_apbh_channel_ctrl_set);  	uint32_t offset = APBH_CHANNEL_CTRL_RESET_CHANNEL_OFFSET;  #endif |