From: Matthew Garrett <mjg@redhat.com>
Date: Thu, 3 May 2012 08:29:01 +0000 (+0100)
Subject: vgaarb: Provide dummy default device functions
X-Git-Tag: v3.6-rc1~59^2~33
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=5db578e167cfeedbd086df45cc2328b5bb9cf3fd;p=linux.git

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>
---

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
 
 /**