From 0e979204bce5f9d056b90b88d02c70f56b8717e2 Mon Sep 17 00:00:00 2001
From: Joerg Roedel <joerg.roedel@amd.com>
Date: Sun, 30 Oct 2011 16:35:08 +0100
Subject: [PATCH] --- yaml --- r: 275926 b: refs/heads/master c:
 466b3ddfbcf4f5ce402a77397630a0fa9ea9ce6b h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/include/linux/pci-ats.h | 6 +++---
 trunk/include/linux/pci.h     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index b37caa44b979..46e7567724b9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d52f54e2ef64c189dedc332e680b2eb4a34590a
+refs/heads/master: 466b3ddfbcf4f5ce402a77397630a0fa9ea9ce6b
diff --git a/trunk/include/linux/pci-ats.h b/trunk/include/linux/pci-ats.h
index e3d0b3890249..7ef68724f0f0 100644
--- a/trunk/include/linux/pci-ats.h
+++ b/trunk/include/linux/pci-ats.h
@@ -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);
@@ -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)
 {
@@ -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
 
diff --git a/trunk/include/linux/pci.h b/trunk/include/linux/pci.h
index 337df0d5d5f7..7cda65b5f798 100644
--- a/trunk/include/linux/pci.h
+++ b/trunk/include/linux/pci.h
@@ -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 */