diff options
| author | Alex Williamson <alex.williamson@redhat.com> | 2015-04-07 13:14:38 -0400 |
|---|---|---|
| committer | Alex Williamson <alex.williamson@redhat.com> | 2015-04-07 13:14:38 -0400 |
| commit | 0ea18b40cdd382a8a338d02e06c4646c35bd753b (patch) | |
| tree | 0c6d2d9dc1c0a016f78f6aeb713615829f2e4120 | |
| parent | 71be3423a62be548c56bab5b818e1a1383e659d2 (diff) | |
vgaarb: Stub vga_set_legacy_decoding()
vga_set_legacy_decoding() is defined in drivers/gpu/vga/vgaarb.c,
which is only compiled with CONFIG_VGA_ARB. A caller would
therefore get an undefined symbol if the VGA arbiter is not
enabled.
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Acked-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | include/linux/vgaarb.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/vgaarb.h b/include/linux/vgaarb.h index c37bd4d06739..8c3b412d84df 100644 --- a/include/linux/vgaarb.h +++ b/include/linux/vgaarb.h | |||
| @@ -65,8 +65,13 @@ struct pci_dev; | |||
| 65 | * out of the arbitration process (and can be safe to take | 65 | * out of the arbitration process (and can be safe to take |
| 66 | * interrupts at any time. | 66 | * interrupts at any time. |
| 67 | */ | 67 | */ |
| 68 | #if defined(CONFIG_VGA_ARB) | ||
| 68 | extern void vga_set_legacy_decoding(struct pci_dev *pdev, | 69 | extern void vga_set_legacy_decoding(struct pci_dev *pdev, |
| 69 | unsigned int decodes); | 70 | unsigned int decodes); |
| 71 | #else | ||
| 72 | static inline void vga_set_legacy_decoding(struct pci_dev *pdev, | ||
| 73 | unsigned int decodes) { }; | ||
| 74 | #endif | ||
| 70 | 75 | ||
| 71 | /** | 76 | /** |
| 72 | * vga_get - acquire & locks VGA resources | 77 | * vga_get - acquire & locks VGA resources |
