aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/dmx/config/xdmxconfig.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-02-11 08:04:06 +0100
committermarha <marha@users.sourceforge.net>2013-02-11 08:04:06 +0100
commitc4583f59d8460f05ee211c2f8ed6208addfe3087 (patch)
tree59420aaa7f249fcf3766adfab41e5285d48048e8 /xorg-server/hw/dmx/config/xdmxconfig.c
parent71ff3367cab660035c6ea38e5171841dacd461b5 (diff)
parent8753441b3ba4316448e1ae5f408e6a84b0116a3c (diff)
downloadvcxsrv-c4583f59d8460f05ee211c2f8ed6208addfe3087.tar.gz
vcxsrv-c4583f59d8460f05ee211c2f8ed6208addfe3087.tar.bz2
vcxsrv-c4583f59d8460f05ee211c2f8ed6208addfe3087.zip
Merge remote-tracking branch 'origin/released'
* origin/released: xserver mesa git update 11 Feb 2013
Diffstat (limited to 'xorg-server/hw/dmx/config/xdmxconfig.c')
-rw-r--r--xorg-server/hw/dmx/config/xdmxconfig.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/xorg-server/hw/dmx/config/xdmxconfig.c b/xorg-server/hw/dmx/config/xdmxconfig.c
index f30841244..2121dd781 100644
--- a/xorg-server/hw/dmx/config/xdmxconfig.c
+++ b/xorg-server/hw/dmx/config/xdmxconfig.c
@@ -31,9 +31,6 @@
*
*/
-#ifdef HAVE_DMX_CONFIG_H
-#include <dmx-config.h>
-#endif
#include <stdio.h>
#include <stdlib.h>