diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-09-10 08:05:45 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-09-10 08:05:45 -0400 |
commit | 3ce9bcb583536c45a46c7302747029450e22279c (patch) | |
tree | 7a4167189ffc6dc909151d1a5d040f9f0656a9f4 /drivers/net/smc91x.c | |
parent | 26fd10517e810dd59ea050b052de24a75ee6dc07 (diff) | |
parent | f7d0b926ac8c8ec0c7a83ee69409bd2e6bb39f81 (diff) |
Merge branch 'core/xen' into x86/xen
Diffstat (limited to 'drivers/net/smc91x.c')
-rw-r--r-- | drivers/net/smc91x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c index 2040965d7724..24768c10cadb 100644 --- a/drivers/net/smc91x.c +++ b/drivers/net/smc91x.c | |||
@@ -2255,7 +2255,7 @@ static int smc_drv_remove(struct platform_device *pdev) | |||
2255 | 2255 | ||
2256 | res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "smc91x-regs"); | 2256 | res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "smc91x-regs"); |
2257 | if (!res) | 2257 | if (!res) |
2258 | platform_get_resource(pdev, IORESOURCE_MEM, 0); | 2258 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
2259 | release_mem_region(res->start, SMC_IO_EXTENT); | 2259 | release_mem_region(res->start, SMC_IO_EXTENT); |
2260 | 2260 | ||
2261 | free_netdev(ndev); | 2261 | free_netdev(ndev); |