diff --git a/[refs] b/[refs] index 55ad4aaaf800..c8d1a19bee17 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cfe2f714d9ebca9d17f392de1fa656d77aa2d4f1 +refs/heads/master: 5a1c84f1465a90192f55e21ccc67fd396c596374 diff --git a/trunk/drivers/video/hpfb.c b/trunk/drivers/video/hpfb.c index b18486ad8e17..2eb4fb159084 100644 --- a/trunk/drivers/video/hpfb.c +++ b/trunk/drivers/video/hpfb.c @@ -207,7 +207,8 @@ static struct fb_ops hpfb_ops = { #define HPFB_FBOMSB 0x5d /* Frame buffer offset */ #define HPFB_FBOLSB 0x5f -static int __init hpfb_init_one(unsigned long phys_base, unsigned long virt_base) +static int __devinit hpfb_init_one(unsigned long phys_base, + unsigned long virt_base) { unsigned long fboff, fb_width, fb_height, fb_start;