---

yaml --- r: 283343 b: refs/heads/master c: b73224f h: refs/heads/master i: 283341: f7f7a56 283339: ef73322 283335: 2c3c40b 283327: 2968018 v: v3
git-mirror · Jan 6, 2012 · d173a59 · d173a59
1 parent ed1a563
commit d173a59
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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:
  *