From ef73322491117bb96ff34d66ab23f641a676a640 Mon Sep 17 00:00:00 2001
From: Myron Stowe <mstowe@redhat.com>
Date: Fri, 28 Oct 2011 15:47:56 -0600
Subject: [PATCH] --- yaml --- r: 283339 b: refs/heads/master c:
 b51d4a3e36c6148f1c044b2d4412e7d2ddb77bd1 h: refs/heads/master i:   283337:
 08bd5959cc512e1d65cb64de586772546c37cd68   283335:
 2c3c40bf1bebd7580ad1a40bf784bdeb7ec0193a v: v3

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

diff --git a/[refs] b/[refs]
index fc65cbc129ba..63ca6de7a707 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 91e86df1a08875bbba9d00d33dc3098f4fd95d4d
+refs/heads/master: b51d4a3e36c6148f1c044b2d4412e7d2ddb77bd1
diff --git a/trunk/arch/microblaze/include/asm/pci.h b/trunk/arch/microblaze/include/asm/pci.h
index 1dd9d6b1e275..033137628e8a 100644
--- a/trunk/arch/microblaze/include/asm/pci.h
+++ b/trunk/arch/microblaze/include/asm/pci.h
@@ -42,11 +42,6 @@ struct pci_dev;
  */
 #define pcibios_assign_all_busses()	0
 
-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/microblaze/pci/pci-common.c b/trunk/arch/microblaze/pci/pci-common.c
index db841c7b9d5b..52b643dd31b9 100644
--- a/trunk/arch/microblaze/pci/pci-common.c
+++ b/trunk/arch/microblaze/pci/pci-common.c
@@ -190,6 +190,11 @@ int pcibios_add_platform_entries(struct pci_dev *pdev)
 	return device_create_file(&pdev->dev, &dev_attr_devspec);
 }
 
+void pcibios_set_master(struct pci_dev *dev)
+{
+	/* No special bus mastering setup handling */
+}
+
 char __devinit *pcibios_setup(char *str)
 {
 	return str;