From afcff68136fe273b0152fe67cdcf2a95df7d4cd9 Mon Sep 17 00:00:00 2001
From: Ben Dooks <ben-linux@fluff.org>
Date: Thu, 29 Sep 2005 05:24:38 +0800
Subject: [PATCH] --- yaml --- r: 9426 b: refs/heads/master c:
 fe984bba30a29398578da3d8c0503fa39e84b838 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/video/s3c2410fb.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7374f6094942..86dd078c817e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 375726d7ed08bd8cf2fe3cfe6b164ffb37fa7e90
+refs/heads/master: fe984bba30a29398578da3d8c0503fa39e84b838
diff --git a/trunk/drivers/video/s3c2410fb.c b/trunk/drivers/video/s3c2410fb.c
index 00c0223a352e..5ab79afb53b7 100644
--- a/trunk/drivers/video/s3c2410fb.c
+++ b/trunk/drivers/video/s3c2410fb.c
@@ -228,8 +228,8 @@ static int s3c2410fb_check_var(struct fb_var_screeninfo *var,
  * information
 */
 
-static int s3c2410fb_activate_var(struct s3c2410fb_info *fbi,
-				  struct fb_var_screeninfo *var)
+static void s3c2410fb_activate_var(struct s3c2410fb_info *fbi,
+				   struct fb_var_screeninfo *var)
 {
 	fbi->regs.lcdcon1 &= ~S3C2410_LCDCON1_MODEMASK;