diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-30 11:22:34 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-30 11:22:34 +1100 |
| commit | de7b2ca7b8e9f4ceb81422276d715badac418796 (patch) | |
| tree | 67d9fafe6045e1fa5b69d83e8d3b3a8e5df5ba9b | |
| parent | c827c270ac94ab19ca930265786259fe70e50dd8 (diff) | |
| parent | 522b119682125a99796e0a1a672b4eb92b69366f (diff) | |
Merge remote branch 'mips/mips-for-linux-next'
| -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); |