diff --git a/[refs] b/[refs] index 9d57794b3333..e16c131826bc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2428e59b5309286842c4bacbe90921b7f67e4ced +refs/heads/master: 050da932f857a7c83949147f3d22e7c02f4f3c91 diff --git a/trunk/drivers/video/pm3fb.c b/trunk/drivers/video/pm3fb.c index 070659992c18..5dba8cdd0517 100644 --- a/trunk/drivers/video/pm3fb.c +++ b/trunk/drivers/video/pm3fb.c @@ -1227,7 +1227,7 @@ static struct fb_ops pm3fb_ops = { /* mmio register are already mapped when this function is called */ /* the pm3fb_fix.smem_start is also set */ -static unsigned long pm3fb_size_memory(struct pm3_par *par) +static unsigned long __devinit pm3fb_size_memory(struct pm3_par *par) { unsigned long memsize = 0; unsigned long tempBypass, i, temp1, temp2;