Merge branch 'x86-pci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-beck.git] / include / linux / pci.h

diff --git a/include/linux/pci.h b/include/linux/pci.h
index e19a69613d8f01548a980425e96ac121e4f8421f..25813738c71af86070065af9dd664f6c765c6e2d 100644 (file)
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1023,6 +1023,11 @@ static inline int pci_proc_domain(struct pci_bus *bus)
 }
 #endif /* CONFIG_PCI_DOMAINS */
 
+/* some architectures require additional setup to direct VGA traffic */
+typedef int (*arch_set_vga_state_t)(struct pci_dev *pdev, bool decode,
+                     unsigned int command_bits, bool change_bridge);
+extern void pci_register_set_vga_state(arch_set_vga_state_t func);
+
 #else /* CONFIG_PCI is not enabled */
 
 /*