diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-27 10:49:56 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-27 10:49:56 +1000 |
| commit | c20bf49a29cf3b99acbe7101a53f3bf03b109f81 (patch) | |
| tree | 50ff84bcfdc583268aa9bb4aa989c5f60d1f3a35 /drivers | |
| parent | 9816284b472d6b120a19e1bbf6d1f8a788795406 (diff) | |
| parent | cddc33c2addaed7d1905c70610a431ce5635a74a (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); |