From 9e4095d5a13656df367a9409e548587f78f7f5d6 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Fri, 19 Apr 2013 08:47:26 +0000 Subject: [PATCH] --- yaml --- r: 362665 b: refs/heads/master c: b261c20fe089859cc43642e7006921498327fe3d h: refs/heads/master i: 362663: 0086e5e7308ab3a0c5dafe7f27d3627acf7c4827 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/8390/ax88796.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 05ee6024774e..fc4c698f6a4a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e393ce57806cb208574abaec78decd5665416895 +refs/heads/master: b261c20fe089859cc43642e7006921498327fe3d diff --git a/trunk/drivers/net/ethernet/8390/ax88796.c b/trunk/drivers/net/ethernet/8390/ax88796.c index cab306a9888e..e1d26433d619 100644 --- a/trunk/drivers/net/ethernet/8390/ax88796.c +++ b/trunk/drivers/net/ethernet/8390/ax88796.c @@ -828,7 +828,7 @@ static int ax_probe(struct platform_device *pdev) struct ei_device *ei_local; struct ax_device *ax; struct resource *irq, *mem, *mem2; - resource_size_t mem_size, mem2_size = 0; + unsigned long mem_size, mem2_size = 0; int ret = 0; dev = ax__alloc_ei_netdev(sizeof(struct ax_device));