diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-23 21:07:24 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-23 21:07:24 +0400 |
| commit | 15f964bed054821d6d940d3752508c5f96a9ffd3 (patch) | |
| tree | 36778917886ab5eeffab356f21827e7ba8a06710 | |
| parent | b09a75fc5e77b7c58d097236f89b1ff72dcdb562 (diff) | |
| parent | 7c329288d72e025db4feac65f0fed95fb3e3ef1c (diff) | |
| download | linux-15f964bed054821d6d940d3752508c5f96a9ffd3.tar.xz | |
Merge branch 'vgaarb-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'vgaarb-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
vgaarb: make client interface config invariant.
| -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 */ |