diff --git a/[refs] b/[refs] index e142479d3f5a..c3abdb96427d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3535ed3fa7a87244410696880000e03bc224315d +refs/heads/master: 9845afc8fa32de145d56c8e69b7900e10371255d diff --git a/trunk/drivers/video/sm501fb.c b/trunk/drivers/video/sm501fb.c index 87f0be1e78b5..6294dca95500 100644 --- a/trunk/drivers/video/sm501fb.c +++ b/trunk/drivers/video/sm501fb.c @@ -1664,7 +1664,7 @@ static void sm501fb_stop(struct sm501fb_info *info) resource_size(info->regs_res)); } -static int sm501fb_init_fb(struct fb_info *fb, +static int __devinit sm501fb_init_fb(struct fb_info *fb, enum sm501_controller head, const char *fbname) {