diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-06 10:37:02 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-06 10:37:02 -0400 |
| commit | ab11b487402f97975f3ac1eeea09c82f4431481e (patch) | |
| tree | 86337c5cbbd2b0c4bd07c0847a1dc7de3d898147 /lib/devres.c | |
| parent | 1c689cbcf2c2b7a35cd237abddd9206bb1b6fee1 (diff) | |
| parent | fc1caf6eafb30ea185720e29f7f5eccca61ecd60 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'lib/devres.c')
| -rw-r--r-- | lib/devres.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/devres.c b/lib/devres.c index 49368608f988..6efddf53b90c 100644 --- a/lib/devres.c +++ b/lib/devres.c | |||
| @@ -328,7 +328,7 @@ EXPORT_SYMBOL(pcim_iomap_regions_request_all); | |||
| 328 | * @pdev: PCI device to map IO resources for | 328 | * @pdev: PCI device to map IO resources for |
| 329 | * @mask: Mask of BARs to unmap and release | 329 | * @mask: Mask of BARs to unmap and release |
| 330 | * | 330 | * |
| 331 | * Unamp and release regions specified by @mask. | 331 | * Unmap and release regions specified by @mask. |
| 332 | */ | 332 | */ |
| 333 | void pcim_iounmap_regions(struct pci_dev *pdev, u16 mask) | 333 | void pcim_iounmap_regions(struct pci_dev *pdev, u16 mask) |
| 334 | { | 334 | { |