diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
| commit | 905ec87e93bc9e01b15c60035cd6a50c636cbaef (patch) | |
| tree | 46fd7618d6511611ffc19eb0dd4d7bc6b90a41c2 /arch/i386/pci/i386.c | |
| parent | 1d6ae775d7a948c9575658eb41184fd2e506c0df (diff) | |
| parent | 2f4ba45a75d6383b4a1201169a808ffea416ffa0 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/i386/pci/i386.c')
| -rw-r--r-- | arch/i386/pci/i386.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/i386/pci/i386.c b/arch/i386/pci/i386.c index 3cc480998a47..6d6338500c3c 100644 --- a/arch/i386/pci/i386.c +++ b/arch/i386/pci/i386.c | |||
| @@ -283,9 +283,9 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, | |||
| 283 | /* Write-combine setting is ignored, it is changed via the mtrr | 283 | /* Write-combine setting is ignored, it is changed via the mtrr |
| 284 | * interfaces on this platform. | 284 | * interfaces on this platform. |
| 285 | */ | 285 | */ |
| 286 | if (remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff, | 286 | if (io_remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff, |
| 287 | vma->vm_end - vma->vm_start, | 287 | vma->vm_end - vma->vm_start, |
| 288 | vma->vm_page_prot)) | 288 | vma->vm_page_prot)) |
| 289 | return -EAGAIN; | 289 | return -EAGAIN; |
| 290 | 290 | ||
| 291 | return 0; | 291 | return 0; |