Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c329288 authored by Ingo Molnar's avatar Ingo Molnar Committed by Dave Airlie
Browse files

vgaarb: make client interface config invariant. 



Fixes build when VGA_ARB is off.

Reported-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 7fa07729

include/linux/vgaarb.h

+10 −1
Original line number Diff line number Diff line
@@ -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 */