Merge branch 'gpio/next-tegra' into gpio/next

Conflicts:
	drivers/gpio/Kconfig
	drivers/gpio/Makefile

1 files changed, 5 insertions, 1 deletions

diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c
index a6b3fb20877..b80d9670cdd 100644
--- a/arch/arm/mach-ep93xx/core.c
+++ b/arch/arm/mach-ep93xx/core.c
@@ -416,11 +416,15 @@ static struct resource ep93xx_eth_resource[] = {
         }
 };
 
+static u64 ep93xx_eth_dma_mask = DMA_BIT_MASK(32);
+
 static struct platform_device ep93xx_eth_device = {
         .name           = "ep93xx-eth",
         .id             = -1,
         .dev            = {
-                .platform_data  = &ep93xx_eth_data,
+                .platform_data          = &ep93xx_eth_data,
+                .coherent_dma_mask      = DMA_BIT_MASK(32),
+                .dma_mask               = &ep93xx_eth_dma_mask,
         },
         .num_resources  = ARRAY_SIZE(ep93xx_eth_resource),
         .resource       = ep93xx_eth_resource,