Merge branch 'ptebits' into devel
Conflicts: arch/arm/Kconfig
This commit is contained in:
@@ -2262,7 +2262,7 @@ static int smc_drv_remove(struct platform_device *pdev)
|
||||
|
||||
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "smc91x-regs");
|
||||
if (!res)
|
||||
platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
release_mem_region(res->start, SMC_IO_EXTENT);
|
||||
|
||||
free_netdev(ndev);
|
||||
|
||||
Reference in New Issue
Block a user