diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-06 13:13:54 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-06 13:13:54 -0400 |
| commit | 11e4afb49b7fa1fc8e1ffd850c1806dd86a08204 (patch) | |
| tree | 9e57efcb106ae912f7bec718feb3f8ec607559bb /lib/devres.c | |
| parent | 162500b3a3ff39d941d29db49b41a16667ae44f0 (diff) | |
| parent | 9b2a606d3898fcb2eedb6faded3bb37549590ac4 (diff) | |
Merge branches 'gemini' and 'misc' into devel
Diffstat (limited to 'lib/devres.c')
| -rw-r--r-- | lib/devres.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/devres.c b/lib/devres.c index 72c8909006da..6efddf53b90c 100644 --- a/lib/devres.c +++ b/lib/devres.c | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | #include <linux/pci.h> | 1 | #include <linux/pci.h> |
| 2 | #include <linux/io.h> | 2 | #include <linux/io.h> |
| 3 | #include <linux/gfp.h> | ||
| 3 | #include <linux/module.h> | 4 | #include <linux/module.h> |
| 4 | 5 | ||
| 5 | void devm_ioremap_release(struct device *dev, void *res) | 6 | void devm_ioremap_release(struct device *dev, void *res) |
| @@ -327,7 +328,7 @@ EXPORT_SYMBOL(pcim_iomap_regions_request_all); | |||
| 327 | * @pdev: PCI device to map IO resources for | 328 | * @pdev: PCI device to map IO resources for |
| 328 | * @mask: Mask of BARs to unmap and release | 329 | * @mask: Mask of BARs to unmap and release |
| 329 | * | 330 | * |
| 330 | * Unamp and release regions specified by @mask. | 331 | * Unmap and release regions specified by @mask. |
| 331 | */ | 332 | */ |
| 332 | void pcim_iounmap_regions(struct pci_dev *pdev, u16 mask) | 333 | void pcim_iounmap_regions(struct pci_dev *pdev, u16 mask) |
| 333 | { | 334 | { |