diff options
| author |   Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-23 17:24:51 +0100 |
|---|---|---|
| committer |   Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-23 17:24:51 +0100 |
| commit | 290815710b51de23f9ed6799d3e0bb762d4f907c (patch) | |
| tree | ba6e0420ee3b5e8b9326ecf1274b71e9f4cc06d3 /arch/arm/mach-loki/common.c | |
| parent | [ARM] disable NX support for OABI-supporting kernels (diff) | |
| parent | [ARM] add coherent DMA mask for mv643xx_eth (diff) | |
| download | wireguard-linux-290815710b51de23f9ed6799d3e0bb762d4f907c.tar.xz wireguard-linux-290815710b51de23f9ed6799d3e0bb762d4f907c.zip | |
Merge branch 'for-rmk' of git://git.marvell.com/orion
Diffstat (limited to 'arch/arm/mach-loki/common.c')
| -rw-r--r-- | arch/arm/mach-loki/common.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-loki/common.c b/arch/arm/mach-loki/common.c index c0d2d9d12e74..818f19d7ab1f 100644 --- a/arch/arm/mach-loki/common.c +++ b/arch/arm/mach-loki/common.c @@ -82,6 +82,9 @@ static struct platform_device loki_ge0 = { .id = 0, .num_resources = 1, .resource = loki_ge0_resources, + .dev = { + .coherent_dma_mask = 0xffffffff, + }, }; void __init loki_ge0_init(struct mv643xx_eth_platform_data *eth_data) @@ -136,6 +139,9 @@ static struct platform_device loki_ge1 = { .id = 1, .num_resources = 1, .resource = loki_ge1_resources, + .dev = { + .coherent_dma_mask = 0xffffffff, + }, }; void __init loki_ge1_init(struct mv643xx_eth_platform_data *eth_data) |