diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-22 10:02:12 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-22 10:02:12 +1100 |
| commit | f342669b6b5b40ca1a9395f836035f3e3218f586 (patch) | |
| tree | 349b2fd2d51d5dfbf64fb5753ffc4d4eaffb82f3 /drivers/video | |
| parent | 5beb29e39d0da4b5ddf9b57dd863afc33114ecdb (diff) | |
| parent | 2a817190850f271a7364be44527cabe6cc4f33a8 (diff) | |
Merge remote branch 'mips/mips-for-linux-next'
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/tdfxfb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/tdfxfb.c b/drivers/video/tdfxfb.c index 980548390048..3ee5e63cfa4f 100644 --- a/drivers/video/tdfxfb.c +++ b/drivers/video/tdfxfb.c @@ -1571,8 +1571,8 @@ out_err_iobase: if (default_par->mtrr_handle >= 0) mtrr_del(default_par->mtrr_handle, info->fix.smem_start, info->fix.smem_len); - release_mem_region(pci_resource_start(pdev, 2), - pci_resource_len(pdev, 2)); + release_region(pci_resource_start(pdev, 2), + pci_resource_len(pdev, 2)); out_err_screenbase: if (info->screen_base) iounmap(info->screen_base); |