diff --git a/[refs] b/[refs]
index 6eec554481d9..7f7cf63916b9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc7fc0601b3eb2254f080492f3fd69e319ed32d0
+refs/heads/master: bc6d7fdf460ec5292d66bb551dbfa49ca682bebf
diff --git a/trunk/drivers/video/fbmem.c b/trunk/drivers/video/fbmem.c
index d2dede6ed3e5..996c7b58564e 100644
--- a/trunk/drivers/video/fbmem.c
+++ b/trunk/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