diff options
author | marha <marha@users.sourceforge.net> | 2014-05-23 19:43:56 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2014-05-23 19:43:56 +0200 |
commit | 1c96f09adce1625dcbae5fe303d7c551a6c1bad3 (patch) | |
tree | 70b5bbde90432287ae91513b8a4edcc55fcf9e9e /xorg-server/hw/xfree86/os-support | |
parent | 697c9a1917acd36a1b99e0d263baf2514446ca11 (diff) | |
parent | 63bfcd0be46413dda8c22b914d12f66ea5d5c66d (diff) | |
download | vcxsrv-1c96f09adce1625dcbae5fe303d7c551a6c1bad3.tar.gz vcxsrv-1c96f09adce1625dcbae5fe303d7c551a6c1bad3.tar.bz2 vcxsrv-1c96f09adce1625dcbae5fe303d7c551a6c1bad3.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mapi/glapi/gen/gl_gentable.py
xorg-server/include/servermd.h
Diffstat (limited to 'xorg-server/hw/xfree86/os-support')
-rw-r--r-- | xorg-server/hw/xfree86/os-support/linux/lnx_video.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/xorg-server/hw/xfree86/os-support/linux/lnx_video.c b/xorg-server/hw/xfree86/os-support/linux/lnx_video.c index 47f5abc2c..40765fccf 100644 --- a/xorg-server/hw/xfree86/os-support/linux/lnx_video.c +++ b/xorg-server/hw/xfree86/os-support/linux/lnx_video.c @@ -59,7 +59,8 @@ static Bool ExtendedEnabled = FALSE; !defined(__mips__) && \ !defined(__nds32__) && \ !defined(__arm__) && \ - !defined(__aarch64__) + !defined(__aarch64__) && \ + !defined(__arc__) /* * Due to conflicts with "compiler.h", don't rely on <sys/io.h> to declare |