From f1a20dba189e3b2c6ee85e599fdcfd02ffcd8908 Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Fri, 21 May 2010 12:44:47 -0700 Subject: [PATCH] --- yaml --- r: 198002 b: refs/heads/master c: f4b87dee923342505e1ddba8d34ce9de33e75050 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/fbmem.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6d5e5a2977b3..fc7c3c95bae1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2faa4cf76e7d229016240b79b50a43d81f458323 +refs/heads/master: f4b87dee923342505e1ddba8d34ce9de33e75050 diff --git a/trunk/drivers/video/fbmem.c b/trunk/drivers/video/fbmem.c index e08b7b5cb326..731fce64df9d 100644 --- a/trunk/drivers/video/fbmem.c +++ b/trunk/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; }