From ed1a5635cc397ace4bf5e18cb1bad3535aa183a5 Mon Sep 17 00:00:00 2001
From: Myron Stowe <mstowe@redhat.com>
Date: Fri, 28 Oct 2011 15:48:17 -0600
Subject: [PATCH] --- yaml --- r: 283342 b: refs/heads/master c:
 cf1c5230cee13a29afb1183796ed2fe124e7b6c0 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index bda3f3a79541..346da43ee68e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba232a1fe4d4bca18efc8966e08dbf85abf11519
+refs/heads/master: cf1c5230cee13a29afb1183796ed2fe124e7b6c0
diff --git a/trunk/arch/tile/include/asm/pci.h b/trunk/arch/tile/include/asm/pci.h
index 7f03cefed1b9..2a2abc742483 100644
--- a/trunk/arch/tile/include/asm/pci.h
+++ b/trunk/arch/tile/include/asm/pci.h
@@ -76,13 +76,6 @@ static inline int pcibios_assign_all_busses(void)
 	return 1;
 }
 
-/*
- * No special bus mastering setup handling.
- */
-static inline void pcibios_set_master(struct pci_dev *dev)
-{
-}
-
 #define PCIBIOS_MIN_MEM		0
 #define PCIBIOS_MIN_IO		0
 
diff --git a/trunk/arch/tile/kernel/pci.c b/trunk/arch/tile/kernel/pci.c
index 9d610d3fb11e..b1025f6b48d1 100644
--- a/trunk/arch/tile/kernel/pci.c
+++ b/trunk/arch/tile/kernel/pci.c
@@ -395,6 +395,11 @@ void __devinit pcibios_fixup_bus(struct pci_bus *bus)
 	/* Nothing needs to be done. */
 }
 
+void pcibios_set_master(struct pci_dev *dev)
+{
+	/* No special bus mastering setup handling. */
+}
+
 /*
  * This can be called from the generic PCI layer, but doesn't need to
  * do anything.