aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-09-22 19:52:18 -0400
committerDave Airlie <airlied@linux.ie>2009-09-22 19:52:18 -0400
commit7c329288d72e025db4feac65f0fed95fb3e3ef1c (patch)
treea94ac798e544f53daf5f48374e8e54b0fb0061ef /include/linux
parent7fa07729e439a6184bd824746d06a49cca553f15 (diff)
vgaarb: make client interface config invariant.
Fixes build when VGA_ARB is off. Reported-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/vgaarb.h11
1 files changed, 10 insertions, 1 deletions
diff --git a/include/linux/vgaarb.h b/include/linux/vgaarb.h
index e81c64af80c1..923f9040ea20 100644
--- a/include/linux/vgaarb.h
+++ b/include/linux/vgaarb.h
@@ -41,7 +41,7 @@
41 * interrupts at any time. 41 * interrupts at any time.
42 */ 42 */
43extern void vga_set_legacy_decoding(struct pci_dev *pdev, 43extern void vga_set_legacy_decoding(struct pci_dev *pdev,
44 unsigned int decodes); 44 unsigned int decodes);
45 45
46/** 46/**
47 * vga_get - acquire & locks VGA resources 47 * vga_get - acquire & locks VGA resources
@@ -193,8 +193,17 @@ static inline int vga_conflicts(struct pci_dev *p1, struct pci_dev *p2)
193 * They driver will get a callback when VGA arbitration is first used 193 * They driver will get a callback when VGA arbitration is first used
194 * by userspace since we some older X servers have issues. 194 * by userspace since we some older X servers have issues.
195 */ 195 */
196#if defined(CONFIG_VGA_ARB)
196int vga_client_register(struct pci_dev *pdev, void *cookie, 197int vga_client_register(struct pci_dev *pdev, void *cookie,
197 void (*irq_set_state)(void *cookie, bool state), 198 void (*irq_set_state)(void *cookie, bool state),
198 unsigned int (*set_vga_decode)(void *cookie, bool state)); 199 unsigned int (*set_vga_decode)(void *cookie, bool state));
200#else
201static inline int vga_client_register(struct pci_dev *pdev, void *cookie,
202 void (*irq_set_state)(void *cookie, bool state),
203 unsigned int (*set_vga_decode)(void *cookie, bool state))
204{
205 return 0;
206}
207#endif
199 208
200#endif /* LINUX_VGA_H */ 209#endif /* LINUX_VGA_H */