From 5db578e167cfeedbd086df45cc2328b5bb9cf3fd Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Thu, 3 May 2012 09:29:01 +0100 Subject: [PATCH] vgaarb: Provide dummy default device functions Add some stub functions for the case where CONFIG_VGA_ARB is disabled. Signed-off-by: Matthew Garrett Signed-off-by: Dave Airlie --- include/linux/vgaarb.h | 5 +++++ 1 file changed, 5 insertions(+) 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 /** -- 2.20.1