diff options
| author | Grant Likely | 2011-06-15 22:57:39 +0200 |
|---|---|---|
| committer | Grant Likely | 2011-06-15 22:57:39 +0200 |
| commit | 2bc7c85210d75b7a8a7326284b4f608a16f52ffc (patch) | |
| tree | ca306d89f64ceeee92531cc0a9ba5d246d09f044 /arch/arm/mach-ep93xx | |
| parent | gpio/74x164: fix clash with gpiolib namespace (diff) | |
| parent | gpio/tegra: add devicetree support (diff) | |
| download | kernel-qcow2-linux-2bc7c85210d75b7a8a7326284b4f608a16f52ffc.tar.gz kernel-qcow2-linux-2bc7c85210d75b7a8a7326284b4f608a16f52ffc.tar.xz kernel-qcow2-linux-2bc7c85210d75b7a8a7326284b4f608a16f52ffc.zip | |
Merge branch 'gpio/next-tegra' into gpio/next
Conflicts:
drivers/gpio/Kconfig
drivers/gpio/Makefile
Diffstat (limited to 'arch/arm/mach-ep93xx')
| -rw-r--r-- | arch/arm/mach-ep93xx/core.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c index a6b3fb208775..b80d9670cdd5 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, |