diff options
| author | Matthew Garrett <mjg@redhat.com> | 2012-05-03 09:29:01 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-05-03 09:30:55 +0100 |
| commit | 6e079d53c116ed9b95d0cad16237e06d5a60b9c4 (patch) | |
| tree | 8b9de7e014744d3d9a872667ba8b39dc88b86250 | |
| parent | 6a556039e7823d27a0a7f7724d4d455053ea9253 (diff) | |
| download | linux-stable-6e079d53c116ed9b95d0cad16237e06d5a60b9c4.tar.gz linux-stable-6e079d53c116ed9b95d0cad16237e06d5a60b9c4.tar.bz2 linux-stable-6e079d53c116ed9b95d0cad16237e06d5a60b9c4.zip | |
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>
| -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); */ #ifndef __ARCH_HAS_VGA_DEFAULT_DEVICE +#ifdef CONFIG_VGA_ARB extern struct pci_dev *vga_default_device(void); extern void vga_set_default_device(struct pci_dev *pdev); +#else +static inline struct pci_dev *vga_default_device(void) { return NULL; }; +static inline void vga_set_default_device(struct pci_dev *pdev) { }; +#endif #endif /** |