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-16 17:16:24 +0530 |
commit | 051f5c78fdb7ca28c52f3ec624bc759b6245dab9 (patch) | |
tree | b1d26969b01c887801b3887431614cc6f65d7ee6 /drivers | |
parent | b852ec1e247b999b88d6a0cf74a46dd8e44db1f7 (diff) |
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>
Diffstat (limited to 'drivers')
-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)); |