From bb78bab38017b34359d5fca7138f6d3e3fa3c88c Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Tue, 31 Mar 2009 15:25:19 -0700
Subject: [PATCH] --- yaml --- r: 139266 b: refs/heads/master c:
 6a7f2829b5f8be124e168265f176dbbbea8861a0 h: refs/heads/master v: v3

---
 [refs]                      |  2 +-
 trunk/drivers/video/fbmem.c | 11 +++++++++++
 trunk/include/linux/fb.h    | 10 +---------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 8797f612f432..136aa381734e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66c1ca019078220dc1bf968f2bb18421100ef147
+refs/heads/master: 6a7f2829b5f8be124e168265f176dbbbea8861a0
diff --git a/trunk/drivers/video/fbmem.c b/trunk/drivers/video/fbmem.c
index b64f061dd447..2ac32e6b5953 100644
--- a/trunk/drivers/video/fbmem.c
+++ b/trunk/drivers/video/fbmem.c
@@ -46,6 +46,17 @@
 struct fb_info *registered_fb[FB_MAX] __read_mostly;
 int num_registered_fb __read_mostly;
 
+int lock_fb_info(struct fb_info *info)
+{
+	mutex_lock(&info->lock);
+	if (!info->fbops) {
+		mutex_unlock(&info->lock);
+		return 0;
+	}
+	return 1;
+}
+EXPORT_SYMBOL(lock_fb_info);
+
 /*
  * Helpers
  */
diff --git a/trunk/include/linux/fb.h b/trunk/include/linux/fb.h
index fe7d0d7907ab..f563c5013932 100644
--- a/trunk/include/linux/fb.h
+++ b/trunk/include/linux/fb.h
@@ -961,15 +961,7 @@ extern struct fb_info *registered_fb[FB_MAX];
 extern int num_registered_fb;
 extern struct class *fb_class;
 
-static inline int lock_fb_info(struct fb_info *info)
-{
-	mutex_lock(&info->lock);
-	if (!info->fbops) {
-		mutex_unlock(&info->lock);
-		return 0;
-	}
-	return 1;
-}
+extern int lock_fb_info(struct fb_info *info);
 
 static inline void unlock_fb_info(struct fb_info *info)
 {