diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2014-02-21 01:32:34 +0400 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-02-21 01:32:34 +0400 |
| commit | 02a0947ae458837424c8c77f1922c54678283df7 (patch) | |
| tree | 798b66b3ecabdfaee04190ea9e49f52fe425077d /include/linux/pci.h | |
| parent | 9d68c783d7e48f0b8cdfc20cd29803b80efe5003 (diff) | |
| parent | 46cb7b1bd86fc227a5325ba8fa4c8be70fade4e8 (diff) | |
| download | linux-02a0947ae458837424c8c77f1922c54678283df7.tar.xz | |
Merge branch 'pci/dead-code' into next
* pci/dead-code:
PCI: Remove unused SR-IOV VF Migration support
iommu/amd: Add include of <linux/irqreturn.h>
mei: Add include of <linux/irqreturn.h>
misc: mic: Add include of <linux/irqreturn.h>
Diffstat (limited to 'include/linux/pci.h')
| -rw-r--r-- | include/linux/pci.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 27b1b9b6dba5..d47b352c2e11 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -29,7 +29,6 @@ #include <linux/atomic.h> #include <linux/device.h> #include <linux/io.h> -#include <linux/irqreturn.h> #include <uapi/linux/pci.h> #include <linux/pci_ids.h> @@ -1600,7 +1599,6 @@ void __iomem *pci_ioremap_bar(struct pci_dev *pdev, int bar); #ifdef CONFIG_PCI_IOV int pci_enable_sriov(struct pci_dev *dev, int nr_virtfn); void pci_disable_sriov(struct pci_dev *dev); -irqreturn_t pci_sriov_migration(struct pci_dev *dev); int pci_num_vf(struct pci_dev *dev); int pci_vfs_assigned(struct pci_dev *dev); int pci_sriov_set_totalvfs(struct pci_dev *dev, u16 numvfs); @@ -1609,8 +1607,6 @@ int pci_sriov_get_totalvfs(struct pci_dev *dev); static inline int pci_enable_sriov(struct pci_dev *dev, int nr_virtfn) { return -ENODEV; } static inline void pci_disable_sriov(struct pci_dev *dev) { } -static inline irqreturn_t pci_sriov_migration(struct pci_dev *dev) -{ return IRQ_NONE; } static inline int pci_num_vf(struct pci_dev *dev) { return 0; } static inline int pci_vfs_assigned(struct pci_dev *dev) { return 0; } |