diff options
Diffstat (limited to 'include/linux/pci.h')
-rw-r--r-- | include/linux/pci.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 96f70d7e058d..f2e57b2e6a81 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
@@ -915,8 +915,11 @@ int pci_cfg_space_size_ext(struct pci_dev *dev); | |||
915 | int pci_cfg_space_size(struct pci_dev *dev); | 915 | int pci_cfg_space_size(struct pci_dev *dev); |
916 | unsigned char pci_bus_max_busnr(struct pci_bus *bus); | 916 | unsigned char pci_bus_max_busnr(struct pci_bus *bus); |
917 | 917 | ||
918 | #define PCI_VGA_STATE_CHANGE_BRIDGE (1 << 0) | ||
919 | #define PCI_VGA_STATE_CHANGE_DECODES (1 << 1) | ||
920 | |||
918 | int pci_set_vga_state(struct pci_dev *pdev, bool decode, | 921 | int pci_set_vga_state(struct pci_dev *pdev, bool decode, |
919 | unsigned int command_bits, bool change_bridge); | 922 | unsigned int command_bits, u32 flags); |
920 | /* kmem_cache style wrapper around pci_alloc_consistent() */ | 923 | /* kmem_cache style wrapper around pci_alloc_consistent() */ |
921 | 924 | ||
922 | #include <linux/pci-dma.h> | 925 | #include <linux/pci-dma.h> |
@@ -1061,7 +1064,7 @@ static inline int pci_proc_domain(struct pci_bus *bus) | |||
1061 | 1064 | ||
1062 | /* some architectures require additional setup to direct VGA traffic */ | 1065 | /* some architectures require additional setup to direct VGA traffic */ |
1063 | typedef int (*arch_set_vga_state_t)(struct pci_dev *pdev, bool decode, | 1066 | typedef int (*arch_set_vga_state_t)(struct pci_dev *pdev, bool decode, |
1064 | unsigned int command_bits, bool change_bridge); | 1067 | unsigned int command_bits, u32 flags); |
1065 | extern void pci_register_set_vga_state(arch_set_vga_state_t func); | 1068 | extern void pci_register_set_vga_state(arch_set_vga_state_t func); |
1066 | 1069 | ||
1067 | #else /* CONFIG_PCI is not enabled */ | 1070 | #else /* CONFIG_PCI is not enabled */ |