diff options
author | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-11 13:24:45 -0400 |
---|---|---|
committer | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-11 13:24:45 -0400 |
commit | 438145c7ef5c9445f25bb8fc4d52e2c9d11fdc7c (patch) | |
tree | 76941991e36f4a32bf1be0db3854959053f24619 /drivers/pci/proc.c | |
parent | 9ddd1b8ad8abd321964b8add5581910de6d67c2a (diff) |
Update from 2.6.36 to 2.6.36.4wip-dissipation-jerickso
Diffstat (limited to 'drivers/pci/proc.c')
-rw-r--r-- | drivers/pci/proc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c index 01f0306525a5..4aae016c79d0 100644 --- a/drivers/pci/proc.c +++ b/drivers/pci/proc.c | |||
@@ -260,7 +260,7 @@ static int proc_bus_pci_mmap(struct file *file, struct vm_area_struct *vma) | |||
260 | 260 | ||
261 | /* Make sure the caller is mapping a real resource for this device */ | 261 | /* Make sure the caller is mapping a real resource for this device */ |
262 | for (i = 0; i < PCI_ROM_RESOURCE; i++) { | 262 | for (i = 0; i < PCI_ROM_RESOURCE; i++) { |
263 | if (pci_mmap_fits(dev, i, vma)) | 263 | if (pci_mmap_fits(dev, i, vma, PCI_MMAP_PROCFS)) |
264 | break; | 264 | break; |
265 | } | 265 | } |
266 | 266 | ||