diff options
| author | Subash Patel <subash.rp@samsung.com> | 2012-12-04 18:05:18 +0530 |
|---|---|---|
| committer | Tushar Behera <tushar.behera@linaro.org> | 2013-01-22 11:41:33 +0530 |
| commit | f3681e28737fe418c9e44ab47b131dc8ad06b8a2 (patch) | |
| tree | b5bd6c7776088ea26b232161447056c8045139a7 | |
| parent | 1e949956fb69091764d81cbbeba78be8494f97c5 (diff) | |
| download | linux-topics-f3681e28737fe418c9e44ab47b131dc8ad06b8a2.tar.gz | |
NET: eth: ax88796: fixup for LPAE
This patch adds condition for variables declared of type
resource_size_t. When LPAE is enabled, these will be 64-bit,
but the linker will throw error for missing __aeabi_uldivmod
support in lib1funcs.s. This patch may be safetly reverted
when this is added.
Signed-off-by: Subash Patel <subash.rp@samsung.com>
| -rw-r--r-- | drivers/net/ethernet/8390/ax88796.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c index 70dba5d01ad..763e575c82b 100644 --- a/drivers/net/ethernet/8390/ax88796.c +++ b/drivers/net/ethernet/8390/ax88796.c @@ -828,7 +828,14 @@ static int ax_probe(struct platform_device *pdev) struct ei_device *ei_local; struct ax_device *ax; struct resource *irq, *mem, *mem2; +#ifndef CONFIG_ARM_LPAE + /* LPAE breaks this code as __aeabi_uldivmod for 64-bit + * is not supported in lib1funcs.s yet + */ resource_size_t mem_size, mem2_size = 0; +#else + u32 mem_size, mem2_size = 0; +#endif int ret = 0; dev = ax__alloc_ei_netdev(sizeof(struct ax_device)); |