Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...

[~andy/linux] / include / linux / vgaarb.h

diff --git a/include/linux/vgaarb.h b/include/linux/vgaarb.h
index a1fa1da8dc1a7257d7e8c1d44f6f14094036bc25..2dfaa293ae8c971303092235da547b5afb438319 100644 (file)
--- a/include/linux/vgaarb.h
+++ b/include/linux/vgaarb.h
@@ -42,7 +42,7 @@
  *     interrupts at any time.
  */
 extern void vga_set_legacy_decoding(struct pci_dev *pdev,
-                                                                       unsigned int decodes);
+                                   unsigned int decodes);
 
 /**
  *     vga_get         - acquire & locks VGA resources
@@ -194,8 +194,17 @@ static inline int vga_conflicts(struct pci_dev *p1, struct pci_dev *p2)
  * They driver will get a callback when VGA arbitration is first used
  * by userspace since we some older X servers have issues.
  */
+#if defined(CONFIG_VGA_ARB)
 int vga_client_register(struct pci_dev *pdev, void *cookie,
                        void (*irq_set_state)(void *cookie, bool state),
                        unsigned int (*set_vga_decode)(void *cookie, bool state));
+#else
+static inline int vga_client_register(struct pci_dev *pdev, void *cookie,
+                                     void (*irq_set_state)(void *cookie, bool state),
+                                     unsigned int (*set_vga_decode)(void *cookie, bool state))
+{
+       return 0;
+}
+#endif
 
 #endif /* LINUX_VGA_H */