diff --git a/[refs] b/[refs] index ede5b8dbf197..a7c786dbe494 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7ad2a78342a6465827226ac00fca6a384cd23f82 +refs/heads/master: 99ff056193924005e650ab3f1719995c3ca82646 diff --git a/trunk/arch/arm/mach-mvebu/Kconfig b/trunk/arch/arm/mach-mvebu/Kconfig index c3715a536d87..e11acbb0a46d 100644 --- a/trunk/arch/arm/mach-mvebu/Kconfig +++ b/trunk/arch/arm/mach-mvebu/Kconfig @@ -14,6 +14,7 @@ config ARCH_MVEBU select MVEBU_CLK_CPU select MVEBU_CLK_GATING select MVEBU_MBUS + select ZONE_DMA if ARM_LPAE if ARCH_MVEBU