Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt...

[mv-sheeva.git] / drivers / video / fbmem.c

diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index e08b7b5cb326efc056912a4a453632470d53982e..731fce64df9d09ef04f9516f7877b891f4d1fbb8 100644 (file)
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -1491,7 +1491,10 @@ static bool fb_do_apertures_overlap(struct apertures_struct *gena,
                for (j = 0; j < gena->count; ++j) {
                        struct aperture *g = &gena->ranges[j];
                        printk(KERN_DEBUG "checking generic (%llx %llx) vs hw (%llx %llx)\n",
-                               g->base, g->size, h->base, h->size);
+                               (unsigned long long)g->base,
+                               (unsigned long long)g->size,
+                               (unsigned long long)h->base,
+                               (unsigned long long)h->size);
                        if (apertures_overlap(g, h))
                                return true;
                }