diff options
author | Tom Rini <trini@konsulko.com> | 2016-01-25 10:40:38 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-01-25 10:40:38 -0500 |
commit | 2218c54bc13c8045903afc05d1364439a230da1f (patch) | |
tree | 04c07b31c7953846b907fab4a4609a38e312b4ab /arch/arm/include/asm/imx-common/dma.h | |
parent | cc4228f9d69f58495c2404adba9145bb36e613bf (diff) | |
parent | ed3fb1fb22fb9e0e786c58c2d80cd030b89b9b7d (diff) | |
download | talos-obmc-uboot-2218c54bc13c8045903afc05d1364439a230da1f.tar.gz talos-obmc-uboot-2218c54bc13c8045903afc05d1364439a230da1f.zip |
Merge branch 'master' of git://git.denx.de/u-boot-imx
Diffstat (limited to 'arch/arm/include/asm/imx-common/dma.h')
-rw-r--r-- | arch/arm/include/asm/imx-common/dma.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/imx-common/dma.h b/arch/arm/include/asm/imx-common/dma.h index 7d421b3967..1aec4f9d5a 100644 --- a/arch/arm/include/asm/imx-common/dma.h +++ b/arch/arm/include/asm/imx-common/dma.h @@ -59,7 +59,7 @@ enum { MXS_DMA_CHANNEL_AHB_APBH_RESERVED1, MXS_MAX_DMA_CHANNELS, }; -#elif defined(CONFIG_MX6) +#elif defined(CONFIG_MX6) || defined(CONFIG_MX7) enum { MXS_DMA_CHANNEL_AHB_APBH_GPMI0 = 0, MXS_DMA_CHANNEL_AHB_APBH_GPMI1, |