xserver: Branch 'master'

[Keith Packard]

 hw/xfree86/os-support/bsd/ppc_video.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c2548d71f7a754251d89696ae49aab2fe07446df
Author: Joerg Sonnenberger <joerg at NetBSD.org>
Date:   Mon Aug 11 10:36:01 2014 +0200

    Fix format string.
    
    Reviewed-by: Keith Packard <keithp at keithp.com>
    Signed-off-by: Thomas Klausner <wiz at NetBSD.org>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xfree86/os-support/bsd/ppc_video.c b/hw/xfree86/os-support/bsd/ppc_video.c
index 947a686..3fd28c3 100644
--- a/hw/xfree86/os-support/bsd/ppc_video.c
+++ b/hw/xfree86/os-support/bsd/ppc_video.c
@@ -76,7 +76,7 @@ ppcMapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
                 (flags & VIDMEM_READONLY) ?
                 PROT_READ : (PROT_READ | PROT_WRITE), MAP_SHARED, fd, Base);
     if (base == MAP_FAILED)
-        FatalError("%s: could not mmap screen [s=%x,a=%x] (%s)",
+        FatalError("%s: could not mmap screen [s=%lx,a=%lx] (%s)",
                    "xf86MapVidMem", Size, Base, strerror(errno));
 
     return base;