diff --git a/[refs] b/[refs] index 4e542233880a..c78027e012b0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b33ecba033ca649f6350696a3057d916a23a775a +refs/heads/master: 44aa417910ec9cda6da42be914105e789273b507 diff --git a/trunk/drivers/video/asiliantfb.c b/trunk/drivers/video/asiliantfb.c index 1a1f946d8fef..9fe90ce928fb 100644 --- a/trunk/drivers/video/asiliantfb.c +++ b/trunk/drivers/video/asiliantfb.c @@ -533,6 +533,7 @@ static int __devinit init_asiliant(struct fb_info *p, unsigned long addr) writeb(0xff, mmio_base + 0x78c); chips_hw_init(p); + return 0; } static int __devinit