---

yaml --- r: 283336 b: refs/heads/master c: cfce9fb h: refs/heads/master v: v3
git-mirror · Jan 6, 2012 · a982806 · a982806
1 parent 2c3c40b
commit a982806
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2502dbdfc878a801b5e6d0b6901c334f4051ca39
+refs/heads/master: cfce9fb808d7d25f6ea18a804eb71b08c7d777c1
diff --git a/trunk/include/linux/pci.h b/trunk/include/linux/pci.h
@@ -1453,8 +1453,10 @@ extern u8 pci_cache_line_size;
 extern unsigned long pci_hotplug_io_size;
 extern unsigned long pci_hotplug_mem_size;
 
+/* Architecture specific versions may override these (weak) */
 int pcibios_add_platform_entries(struct pci_dev *dev);
 void pcibios_disable_device(struct pci_dev *dev);
+void pcibios_set_master(struct pci_dev *dev);
 int pcibios_set_pcie_reset_state(struct pci_dev *dev,
 				 enum pcie_reset_state state);