summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVlada Peric <vlada.peric@gmail.com>2009-04-21 21:23:59 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-21 22:41:47 +0200
commit44aa417910ec9cda6da42be914105e789273b507 (patch)
treebe2ea32bb8d74b309b7602b7315c7234cd7e7344
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes (diff)
downloadlinux-44aa417910ec9cda6da42be914105e789273b507.tar.xz
linux-44aa417910ec9cda6da42be914105e789273b507.zip
asiliantfb: add missing return statement
Commit 032220ba (asiliantfb: fix cmap memory leaks) changed the function init_asiliant from void to int, resulting in the following compile warning: drivers/video/asiliantfb.c: In function `init_asiliant': drivers/video/asiliantfb.c:536: warning: control reaches end of non-void function Fix the warning by returning 0. Signed-off-by: Vlada Peric <vlada.peric@gmail.com> Cc: Andres Salomon <dilinger@debian.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/video/asiliantfb.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/asiliantfb.c b/drivers/video/asiliantfb.c
index 1a1f946d8fef..9fe90ce928fb 100644
--- a/drivers/video/asiliantfb.c
+++ b/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