diff --git a/[refs] b/[refs] index 78c80b7896d4..dd1d48acb148 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b3282ab116cd7ebd2829ac8088524b5b279330e5 +refs/heads/master: ffb287c9daabc3734a92def0d59796f065ad29eb diff --git a/trunk/drivers/video/pxa168fb.c b/trunk/drivers/video/pxa168fb.c index c91a7f70f7b0..5d786bd3e304 100644 --- a/trunk/drivers/video/pxa168fb.c +++ b/trunk/drivers/video/pxa168fb.c @@ -559,7 +559,7 @@ static struct fb_ops pxa168fb_ops = { .fb_imageblit = cfb_imageblit, }; -static int __init pxa168fb_init_mode(struct fb_info *info, +static int __devinit pxa168fb_init_mode(struct fb_info *info, struct pxa168fb_mach_info *mi) { struct pxa168fb_info *fbi = info->par; @@ -599,7 +599,7 @@ static int __init pxa168fb_init_mode(struct fb_info *info, return ret; } -static int __init pxa168fb_probe(struct platform_device *pdev) +static int __devinit pxa168fb_probe(struct platform_device *pdev) { struct pxa168fb_mach_info *mi; struct fb_info *info = 0; @@ -792,7 +792,7 @@ static struct platform_driver pxa168fb_driver = { .probe = pxa168fb_probe, }; -static int __devinit pxa168fb_init(void) +static int __init pxa168fb_init(void) { return platform_driver_register(&pxa168fb_driver); }