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

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

diff --git a/[refs] b/[refs]
index 9ea53e5b2b0b..f2b3118b2a15 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b73224fdcf273956ee52c5c0975ee400231f6cdb
+refs/heads/master: 9cdce18d6f0baae53f012fb3f50e66e7ff24c509
diff --git a/trunk/arch/xtensa/include/asm/pci.h b/trunk/arch/xtensa/include/asm/pci.h
index 4609b0f15f1f..05244f07dd31 100644
--- a/trunk/arch/xtensa/include/asm/pci.h
+++ b/trunk/arch/xtensa/include/asm/pci.h
@@ -22,11 +22,6 @@
 
 extern struct pci_controller* pcibios_alloc_controller(void);
 
-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)
 {
 	/* We don't do dynamic PCI IRQ allocation */
diff --git a/trunk/arch/xtensa/kernel/pci.c b/trunk/arch/xtensa/kernel/pci.c
index cd1026931203..644b2d4b299d 100644
--- a/trunk/arch/xtensa/kernel/pci.c
+++ b/trunk/arch/xtensa/kernel/pci.c
@@ -227,6 +227,11 @@ char __init *pcibios_setup(char *str)
 	return str;
 }
 
+void pcibios_set_master(struct pci_dev *dev)
+{
+	/* No special bus mastering setup handling */
+}
+
 /* the next one is stolen from the alpha port... */
 
 void __init