xf86-video-mach64: Branch 'master'

[Dave Airlie]

 src/atipreinit.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 810572536e153ac9e4615a35e2ab99dc266806da
Author: Dave Airlie <airlied at redhat.com>
Date:   Sat Nov 15 11:29:54 2014 +1000

    mach64: fix build probably not required with pci access anyways

diff --git a/src/atipreinit.c b/src/atipreinit.c
index e3048d2..dbcd9fd 100644
--- a/src/atipreinit.c
+++ b/src/atipreinit.c
@@ -1079,12 +1079,14 @@ ATIPreInit
         }
     }
 
+#ifndef XSERVER_LIBPCIACCESS
     if (!xf86LinearVidMem())
     {
         xf86DrvMsg(pScreenInfo->scrnIndex, X_ERROR,
             "A linear aperture is not available.\n");
         goto bail;
     }
+#endif
 
     /*
      * Set colour weights.