Merge branch 'vgaarb-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

 * 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 */