aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2006-02-11 17:56:08 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-11 21:41:13 -0800
commitbc6d7fdf460ec5292d66bb551dbfa49ca682bebf (patch)
treee588c90655637a30481fc2926ff6031064cf44fa
parentbc7fc0601b3eb2254f080492f3fd69e319ed32d0 (diff)
downloadlinux-2.6.34-ux500-bc6d7fdf460ec5292d66bb551dbfa49ca682bebf.tar.gz
[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>
-rw-r--r--drivers/video/fbmem.c2
1 files changed, 2 insertions, 0 deletions
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