diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-23 11:16:39 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-23 11:16:39 +1000 |
| commit | f35d188e8adee179b61f4dad888e71a76d883345 (patch) | |
| tree | 747f74bddfd41dbb67d64b2ff6d468297cd919e0 /drivers | |
| parent | 763a17ced7739aa7c867d7e5b6f994bb1e5d4c00 (diff) | |
| parent | a659c1d8cf5da5f7dd8cec8f50bf8d6f0b25ab13 (diff) | |
Merge remote branch 'mips/mips-for-linux-next'
Diffstat (limited to 'drivers')
| -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); |