Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 275926
b: refs/heads/master
c: 466b3dd
h: refs/heads/master
v: v3
  • Loading branch information
Joerg Roedel authored and Jesse Barnes committed Oct 31, 2011
1 parent 49de952 commit 0e97920
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0d52f54e2ef64c189dedc332e680b2eb4a34590a
refs/heads/master: 466b3ddfbcf4f5ce402a77397630a0fa9ea9ce6b
6 changes: 3 additions & 3 deletions trunk/include/linux/pci-ats.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ struct pci_ats {
unsigned int is_enabled:1; /* Enable bit is set */
};

#ifdef CONFIG_PCI_IOV
#ifdef CONFIG_PCI_ATS

extern int pci_enable_ats(struct pci_dev *dev, int ps);
extern void pci_disable_ats(struct pci_dev *dev);
Expand All @@ -29,7 +29,7 @@ static inline int pci_ats_enabled(struct pci_dev *dev)
return dev->ats && dev->ats->is_enabled;
}

#else /* CONFIG_PCI_IOV */
#else /* CONFIG_PCI_ATS */

static inline int pci_enable_ats(struct pci_dev *dev, int ps)
{
Expand All @@ -50,7 +50,7 @@ static inline int pci_ats_enabled(struct pci_dev *dev)
return 0;
}

#endif /* CONFIG_PCI_IOV */
#endif /* CONFIG_PCI_ATS */

#ifdef CONFIG_PCI_PRI

Expand Down
2 changes: 1 addition & 1 deletion trunk/include/linux/pci.h
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ struct pci_dev {
struct list_head msi_list;
#endif
struct pci_vpd *vpd;
#ifdef CONFIG_PCI_IOV
#ifdef CONFIG_PCI_ATS
union {
struct pci_sriov *sriov; /* SR-IOV capability related */
struct pci_dev *physfn; /* the PF this VF is associated with */
Expand Down

0 comments on commit 0e97920

Please sign in to comment.