diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-09-23 09:52:18 +1000 |
|---|---|---|
| committer |   Dave Airlie <airlied@linux.ie> | 2009-09-23 09:52:18 +1000 |
| commit | 7c329288d72e025db4feac65f0fed95fb3e3ef1c (patch) | |
| tree | a94ac798e544f53daf5f48374e8e54b0fb0061ef /include/linux/vgaarb.h | |
| parent | Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff) | |
| download | wireguard-linux-7c329288d72e025db4feac65f0fed95fb3e3ef1c.tar.xz wireguard-linux-7c329288d72e025db4feac65f0fed95fb3e3ef1c.zip | |
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/vgaarb.h')
| -rw-r--r-- | include/linux/vgaarb.h | 11 |
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 @@ * 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 @@ -193,8 +193,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 */ |