From d173a5913148fe01393411aa9b56adb932ee3a7f Mon Sep 17 00:00:00 2001
From: Myron Stowe <mstowe@redhat.com>
Date: Fri, 28 Oct 2011 15:48:24 -0600
Subject: [PATCH] --- yaml --- r: 283343 b: refs/heads/master c:
 b73224fdcf273956ee52c5c0975ee400231f6cdb h: refs/heads/master i:   283341:
 f7f7a563c6c9821aeb677904abcda2e1b14eb0e4   283339:
 ef73322491117bb96ff34d66ab23f641a676a640   283335:
 2c3c40bf1bebd7580ad1a40bf784bdeb7ec0193a   283327:
 2968018584252b19a6604c5c8fe959fb810c9148 v: v3

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

diff --git a/[refs] b/[refs]
index 346da43ee68e..9ea53e5b2b0b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf1c5230cee13a29afb1183796ed2fe124e7b6c0
+refs/heads/master: b73224fdcf273956ee52c5c0975ee400231f6cdb
diff --git a/trunk/arch/unicore32/include/asm/pci.h b/trunk/arch/unicore32/include/asm/pci.h
index c5b28b459535..dd3867727c35 100644
--- a/trunk/arch/unicore32/include/asm/pci.h
+++ b/trunk/arch/unicore32/include/asm/pci.h
@@ -17,11 +17,6 @@
 #include <asm-generic/pci.h>
 #include <mach/hardware.h> /* for PCIBIOS_MIN_* */
 
-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)
 {
 	/* We don't do dynamic PCI IRQ allocation */
diff --git a/trunk/arch/unicore32/kernel/pci.c b/trunk/arch/unicore32/kernel/pci.c
index 4892fbb54ebf..a8f07fe10cad 100644
--- a/trunk/arch/unicore32/kernel/pci.c
+++ b/trunk/arch/unicore32/kernel/pci.c
@@ -309,6 +309,11 @@ char * __devinit pcibios_setup(char *str)
 	return str;
 }
 
+void pcibios_set_master(struct pci_dev *dev)
+{
+	/* No special bus mastering setup handling */
+}
+
 /*
  * From arch/i386/kernel/pci-i386.c:
  *