diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-23 12:24:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-23 12:24:51 -0400 |
| commit | 290815710b51de23f9ed6799d3e0bb762d4f907c (patch) | |
| tree | ba6e0420ee3b5e8b9326ecf1274b71e9f4cc06d3 /arch/arm/mach-loki/common.c | |
| parent | 14f0aa359365e8a93a77b71e3b840274b9b4dcb1 (diff) | |
| parent | a49a018a6ea6d73742a81d673fe5ec4a7d2137b3 (diff) | |
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 = { | |||
| 82 | .id = 0, | 82 | .id = 0, |
| 83 | .num_resources = 1, | 83 | .num_resources = 1, |
| 84 | .resource = loki_ge0_resources, | 84 | .resource = loki_ge0_resources, |
| 85 | .dev = { | ||
| 86 | .coherent_dma_mask = 0xffffffff, | ||
| 87 | }, | ||
| 85 | }; | 88 | }; |
| 86 | 89 | ||
| 87 | void __init loki_ge0_init(struct mv643xx_eth_platform_data *eth_data) | 90 | void __init loki_ge0_init(struct mv643xx_eth_platform_data *eth_data) |
| @@ -136,6 +139,9 @@ static struct platform_device loki_ge1 = { | |||
| 136 | .id = 1, | 139 | .id = 1, |
| 137 | .num_resources = 1, | 140 | .num_resources = 1, |
| 138 | .resource = loki_ge1_resources, | 141 | .resource = loki_ge1_resources, |
| 142 | .dev = { | ||
| 143 | .coherent_dma_mask = 0xffffffff, | ||
| 144 | }, | ||
| 139 | }; | 145 | }; |
| 140 | 146 | ||
| 141 | void __init loki_ge1_init(struct mv643xx_eth_platform_data *eth_data) | 147 | void __init loki_ge1_init(struct mv643xx_eth_platform_data *eth_data) |