diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-01-29 04:33:37 +0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-01-29 04:33:37 +0400 |
| commit | dfd0436ad0ce139467b124c646fa65ee2635e14a (patch) | |
| tree | abf9d83c704417cdd484243c12aeffee6b185aba /drivers/xen/xen-pciback/pciback.h | |
| parent | b9818c3312da66f4b83a4a2e8650628be1237cb5 (diff) | |
| parent | 689dfa894c57842a05bf6dc9f97e6bb71ec5f386 (diff) | |
| download | linux-dfd0436ad0ce139467b124c646fa65ee2635e14a.tar.xz | |
Merge branch 'merge' into next
Merge "merge" branch to bring in various bug fixes that are
going into 3.8
Diffstat (limited to 'drivers/xen/xen-pciback/pciback.h')
| -rw-r--r-- | drivers/xen/xen-pciback/pciback.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/xen/xen-pciback/pciback.h b/drivers/xen/xen-pciback/pciback.h index a7def010eba3..f72af87640e0 100644 --- a/drivers/xen/xen-pciback/pciback.h +++ b/drivers/xen/xen-pciback/pciback.h @@ -124,7 +124,7 @@ static inline int xen_pcibk_add_pci_dev(struct xen_pcibk_device *pdev, static inline void xen_pcibk_release_pci_dev(struct xen_pcibk_device *pdev, struct pci_dev *dev) { - if (xen_pcibk_backend && xen_pcibk_backend->free) + if (xen_pcibk_backend && xen_pcibk_backend->release) return xen_pcibk_backend->release(pdev, dev); } |