diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2014-02-20 14:32:34 -0700 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-02-20 14:32:34 -0700 |
| commit | 02a0947ae458837424c8c77f1922c54678283df7 (patch) | |
| tree | 798b66b3ecabdfaee04190ea9e49f52fe425077d /drivers/pci/pci.h | |
| parent | 9d68c783d7e48f0b8cdfc20cd29803b80efe5003 (diff) | |
| parent | 46cb7b1bd86fc227a5325ba8fa4c8be70fade4e8 (diff) | |
| download | op-kernel-dev-02a0947ae458837424c8c77f1922c54678283df7.zip op-kernel-dev-02a0947ae458837424c8c77f1922c54678283df7.tar.gz | |
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 'drivers/pci/pci.h')
| -rw-r--r-- | drivers/pci/pci.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 4df38df..6bd0822 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -1,8 +1,6 @@ #ifndef DRIVERS_PCI_H #define DRIVERS_PCI_H -#include <linux/workqueue.h> - #define PCI_CFG_SPACE_SIZE 256 #define PCI_CFG_SPACE_EXP_SIZE 4096 @@ -240,8 +238,6 @@ struct pci_sriov { struct pci_dev *dev; /* lowest numbered PF */ struct pci_dev *self; /* this PF */ struct mutex lock; /* lock for VF bus */ - struct work_struct mtask; /* VF Migration task */ - u8 __iomem *mstate; /* VF Migration State Array */ }; #ifdef CONFIG_PCI_ATS |
