From 7818665c7d47dec7447041e0ffc79eb612266d59 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Sun, 15 Apr 2012 11:39:04 +0100
Subject: [PATCH] --- yaml --- r: 310267 b: refs/heads/master c:
 2293d620bef6cc76760d1790b93c8c100b1b872a h: refs/heads/master i:   310265:
 85ee334df538759e80fe731f4700e66f463cdd8f   310263:
 bab6f7ca6b4995151cb197d71e257160f787739f v: v3

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

diff --git a/[refs] b/[refs]
index 643c206d4f7a..57eb70e85f9d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3499b1d829649880be07248d6339d060266bbe96
+refs/heads/master: 2293d620bef6cc76760d1790b93c8c100b1b872a
diff --git a/trunk/drivers/video/s3c-fb.c b/trunk/drivers/video/s3c-fb.c
index ecb82bb4e606..70aff118b76e 100644
--- a/trunk/drivers/video/s3c-fb.c
+++ b/trunk/drivers/video/s3c-fb.c
@@ -1056,7 +1056,7 @@ static struct fb_ops s3c_fb_ops = {
  *
  * Calculate the pixel clock when none has been given through platform data.
  */
-static void __devinit s3c_fb_missing_pixclock(struct fb_videomode *mode)
+static void s3c_fb_missing_pixclock(struct fb_videomode *mode)
 {
 	u64 pixclk = 1000000000000ULL;
 	u32 div;