---

yaml --- r: 107153 b: refs/heads/master c: 47a5c97 h: refs/heads/master i: 107151: 669f79e v: v3
git-mirror · Jul 30, 2008 · f9fef08 · f9fef08
1 parent fb6158a
commit f9fef08
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 32d00d0f933ea5d21c3cd0809461ebbf7ab89cef
+refs/heads/master: 47a5c976486e407fc0d0bc8fa165132b6f9bec26
diff --git a/trunk/arch/mips/pci/pci.c b/trunk/arch/mips/pci/pci.c
@@ -328,7 +328,11 @@ EXPORT_SYMBOL(PCIBIOS_MIN_IO);
 EXPORT_SYMBOL(PCIBIOS_MIN_MEM);
 #endif
 
-char *pcibios_setup(char *str)
+char * (*pcibios_plat_setup)(char *str) __devinitdata;
+
+char *__devinit pcibios_setup(char *str)
 {
+	if (pcibios_plat_setup)
+		return pcibios_plat_setup(str);
 	return str;
 }
diff --git a/trunk/include/asm-mips/pci.h b/trunk/include/asm-mips/pci.h
@@ -174,4 +174,6 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
 
 extern int pci_probe_only;
 
+extern char * (*pcibios_plat_setup)(char *str);
+
 #endif /* _ASM_PCI_H */
Original file line number	Diff line number	Diff line change
Expand Up		@@ -174,4 +174,6 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)

		extern int pci_probe_only;

		extern char * (pcibios_plat_setup)(char str);

		#endif /* _ASM_PCI_H */