aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/pci.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-02-28 13:59:18 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2010-02-28 13:59:18 -0500
commitc7e15899d07c9813c1aa96b21699d2d9c8314c4b (patch)
tree16e9b4dceddf1b4d1dad05588d700c70cf8fcb88 /include/linux/pci.h
parentf6a0b5cd34d6e922cc7258c5429fb0f17508ceb6 (diff)
parent78c06176466cbd1b3f0f67709d3023c40dbebcbd (diff)
Merge branch 'x86-pci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-pci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Enable NMI on all cpus on UV vgaarb: Add user selectability of the number of GPUS in a system vgaarb: Fix VGA arbiter to accept PCI domains other than 0 x86, uv: Update UV arch to target Legacy VGA I/O correctly. pci: Update pci_set_vga_state() to call arch functions
Diffstat (limited to 'include/linux/pci.h')
-rw-r--r--include/linux/pci.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h
index e19a69613d8..25813738c71 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1023,6 +1023,11 @@ static inline int pci_proc_domain(struct pci_bus *bus)
1023} 1023}
1024#endif /* CONFIG_PCI_DOMAINS */ 1024#endif /* CONFIG_PCI_DOMAINS */
1025 1025
1026/* some architectures require additional setup to direct VGA traffic */
1027typedef int (*arch_set_vga_state_t)(struct pci_dev *pdev, bool decode,
1028 unsigned int command_bits, bool change_bridge);
1029extern void pci_register_set_vga_state(arch_set_vga_state_t func);
1030
1026#else /* CONFIG_PCI is not enabled */ 1031#else /* CONFIG_PCI is not enabled */
1027 1032
1028/* 1033/*