From 084ec0117e471ae6b59443f27cad275c4900fc45 Mon Sep 17 00:00:00 2001
From: Myron Stowe <mstowe@redhat.com>
Date: Fri, 28 Oct 2011 15:47:49 -0600
Subject: [PATCH] --- yaml --- r: 283338 b: refs/heads/master c:
 91e86df1a08875bbba9d00d33dc3098f4fd95d4d h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/arch/ia64/include/asm/pci.h | 6 ------
 trunk/arch/ia64/pci/pci.c         | 5 +++++
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 4c615e98fa90..fc65cbc129ba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 168c8619fd825d80d1753bf298d0b6aa8d739623
+refs/heads/master: 91e86df1a08875bbba9d00d33dc3098f4fd95d4d
diff --git a/trunk/arch/ia64/include/asm/pci.h b/trunk/arch/ia64/include/asm/pci.h
index 127dd7be346a..279b38ae74aa 100644
--- a/trunk/arch/ia64/include/asm/pci.h
+++ b/trunk/arch/ia64/include/asm/pci.h
@@ -42,12 +42,6 @@ struct pci_dev;
 extern unsigned long ia64_max_iommu_merge_mask;
 #define PCI_DMA_BUS_IS_PHYS	(ia64_max_iommu_merge_mask == ~0UL)
 
-static inline void
-pcibios_set_master (struct pci_dev *dev)
-{
-	/* No special bus mastering setup handling */
-}
-
 static inline void
 pcibios_penalize_isa_irq (int irq, int active)
 {
diff --git a/trunk/arch/ia64/pci/pci.c b/trunk/arch/ia64/pci/pci.c
index 2c27714d7b78..99f232c50bd1 100644
--- a/trunk/arch/ia64/pci/pci.c
+++ b/trunk/arch/ia64/pci/pci.c
@@ -514,6 +514,11 @@ pcibios_fixup_bus (struct pci_bus *b)
 	return;
 }
 
+void pcibios_set_master (struct pci_dev *dev)
+{
+	/* No special bus mastering setup handling */
+}
+
 void __devinit
 pcibios_update_irq (struct pci_dev *dev, int irq)
 {