xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/drivers/modesetting/driver.c |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 862cbf4c870c9ed913206c6ef4988bdb470e1c39
Author: Thomas Klausner <wiz at NetBSD.org>
Date:   Wed Nov 11 13:32:05 2015 +0100

    Fix build when XSERVER_PLATFORM_BUS is not defined.
    
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Thomas Klausner <wiz at NetBSD.org>

diff --git a/hw/xfree86/drivers/modesetting/driver.c b/hw/xfree86/drivers/modesetting/driver.c
index e53d3d4..8f60eae 100644
--- a/hw/xfree86/drivers/modesetting/driver.c
+++ b/hw/xfree86/drivers/modesetting/driver.c
@@ -90,6 +90,10 @@ static const struct pci_id_match ms_device_match[] = {
 };
 #endif
 
+#ifndef XSERVER_PLATFORM_BUS
+struct xf86_platform_device;
+#endif
+
 #ifdef XSERVER_PLATFORM_BUS
 static Bool ms_platform_probe(DriverPtr driver,
                               int entity_num, int flags,