xserver: Branch 'master'

[Keith Packard]

 hw/dmx/config/dmxcompat.c |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit b2015a2c01711646bb7ae23d684abee0cd55d4d0
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Thu Nov 24 13:54:08 2011 -0800

    dmx: Build fix for -Werror=implicit-function-declaration on linux
    
    Fixes regression introduced by: 6e6d732bac3c21cb85f8e998908f9b393630e5f8
    Found-by: Tinderbox
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
    CC: Alan Coopersmith <alan.coopersmith at oracle.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/dmx/config/dmxcompat.c b/hw/dmx/config/dmxcompat.c
index 98c52eb..1c72084 100644
--- a/hw/dmx/config/dmxcompat.c
+++ b/hw/dmx/config/dmxcompat.c
@@ -42,6 +42,7 @@
 #include <dmx-config.h>
 #endif
 
+#include "os.h"
 #include "dmxconfig.h"
 #include "dmxparse.h"
 #include "dmxcompat.h"