projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Revert "stm32: Change USART port to USART6 for stm32f746 discovery board"
[oweals/u-boot.git]
/
arch
/
arm
/
include
/
asm
/
imx-common
/
dma.h
diff --git
a/arch/arm/include/asm/imx-common/dma.h
b/arch/arm/include/asm/imx-common/dma.h
index 7d421b3967cfb8295abfa4cb84d8f0d048879a5f..1aec4f9d5a2a8db0ffc9a25a61957dd7e733c720 100644
(file)
--- 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,