From e660b3b15fa25618cc917d415f3f241c2cc43284 Mon Sep 17 00:00:00 2001
From: Matthew Garrett <mjg@redhat.com>
Date: Thu, 3 May 2012 09:29:01 +0100
Subject: [PATCH] --- yaml --- r: 307229 b: refs/heads/master c:
 6e079d53c116ed9b95d0cad16237e06d5a60b9c4 h: refs/heads/master i:   307227:
 7141b402eb2bc62e1d6b90a79857d9e86dae985c v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/vgaarb.h | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 33d6c639637e..569825f17b18 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a556039e7823d27a0a7f7724d4d455053ea9253
+refs/heads/master: 6e079d53c116ed9b95d0cad16237e06d5a60b9c4
diff --git a/trunk/include/linux/vgaarb.h b/trunk/include/linux/vgaarb.h
index 367ab18dccf7..0ee42d9acdc0 100644
--- a/trunk/include/linux/vgaarb.h
+++ b/trunk/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
 
 /**