From: Andrew Morton <akpm@osdl.org>
Date: Sun, 12 Feb 2006 01:56:08 +0000 (-0800)
Subject: [PATCH] fbdev: video_setup() warning fix
X-Git-Tag: v2.6.16-rc3~8
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=bc6d7fdf460ec5292d66bb551dbfa49ca682bebf;p=linux-2.6-omap-h63xx.git

[PATCH] fbdev: video_setup() warning fix

drivers/video/fbmem.c:1567: warning: 'video_setup' defined but not used

Acked-by: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index d2dede6ed3e..996c7b58564 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -1550,6 +1550,7 @@ int fb_get_options(char *name, char **option)
 	return retval;
 }
 
+#ifndef MODULE
 /**
  *	video_setup - process command line options
  *	@options: string of options
@@ -1593,6 +1594,7 @@ static int __init video_setup(char *options)
 	return 0;
 }
 __setup("video=", video_setup);
+#endif
 
     /*
      *  Visible symbols for modules