diff options
author | Matthew Garrett <mjg@redhat.com> | 2012-05-03 04:29:01 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-05-03 04:30:55 -0400 |
commit | 6e079d53c116ed9b95d0cad16237e06d5a60b9c4 (patch) | |
tree | 8b9de7e014744d3d9a872667ba8b39dc88b86250 /include/linux/vgaarb.h | |
parent | 6a556039e7823d27a0a7f7724d4d455053ea9253 (diff) |
vgaarb: Provide dummy default device functions
Add some stub functions for the case where CONFIG_VGA_ARB is disabled.
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/linux/vgaarb.h')
-rw-r--r-- | include/linux/vgaarb.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/vgaarb.h b/include/linux/vgaarb.h index 367ab18dccf7..0ee42d9acdc0 100644 --- a/include/linux/vgaarb.h +++ b/include/linux/vgaarb.h | |||
@@ -183,8 +183,13 @@ extern void vga_put(struct pci_dev *pdev, unsigned int rsrc); | |||
183 | */ | 183 | */ |
184 | 184 | ||
185 | #ifndef __ARCH_HAS_VGA_DEFAULT_DEVICE | 185 | #ifndef __ARCH_HAS_VGA_DEFAULT_DEVICE |
186 | #ifdef CONFIG_VGA_ARB | ||
186 | extern struct pci_dev *vga_default_device(void); | 187 | extern struct pci_dev *vga_default_device(void); |
187 | extern void vga_set_default_device(struct pci_dev *pdev); | 188 | extern void vga_set_default_device(struct pci_dev *pdev); |
189 | #else | ||
190 | static inline struct pci_dev *vga_default_device(void) { return NULL; }; | ||
191 | static inline void vga_set_default_device(struct pci_dev *pdev) { }; | ||
192 | #endif | ||
188 | #endif | 193 | #endif |
189 | 194 | ||
190 | /** | 195 | /** |