X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=include%2Flinux%2Fvgaarb.h;h=0ee42d9acdc0f605dc0264b071834cb53dcd95e9;hb=785a7de9ee5ab1ff2ec9c6e58667bde1055f2f1b;hp=b572f80bdfd527d10a9793047c6d2f7c14f0d685;hpb=1e20932a23578bb1ec59107843574e259b96193f;p=deliverable%2Flinux.git

diff --git a/include/linux/vgaarb.h b/include/linux/vgaarb.h
index b572f80bdfd5..0ee42d9acdc0 100644
--- a/include/linux/vgaarb.h
+++ b/include/linux/vgaarb.h
@@ -31,6 +31,7 @@
 #ifndef LINUX_VGA_H
 #define LINUX_VGA_H
 
+#include <video/vga.h>
 
 /* Legacy VGA regions */
 #define VGA_RSRC_NONE	       0x00
@@ -182,7 +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
 
 /**