1 files changed, 0 insertions, 92 deletions

diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
index b5e85f6c1c26..0705d8883ede 100644
--- a/drivers/video/fbdev/core/fbmem.c
+++ b/drivers/video/fbdev/core/fbmem.c
@@ -1908,96 +1908,4 @@ int fb_new_modelist(struct fb_info *info)
         return err;
 }
 
-static char *video_options[FB_MAX] __read_mostly;
-static int ofonly __read_mostly;
-
-/**
- * fb_get_options - get kernel boot parameters
- * @name:   framebuffer name as it would appear in
- *          the boot parameter line
- *          (video=<name>:<options>)
- * @option: the option will be stored here
- *
- * NOTE: Needed to maintain backwards compatibility
- */
-int fb_get_options(const char *name, char **option)
-{
-        char *opt, *options = NULL;
-        int retval = 0;
-        int name_len = strlen(name), i;
-
-        if (name_len && ofonly && strncmp(name, "offb", 4))
-                retval = 1;
-
-        if (name_len && !retval) {
-                for (i = 0; i < FB_MAX; i++) {
-                        if (video_options[i] == NULL)
-                                continue;
-                        if (!video_options[i][0])
-                                continue;
-                        opt = video_options[i];
-                        if (!strncmp(name, opt, name_len) &&
-                            opt[name_len] == ':')
-                                options = opt + name_len + 1;
-                }
-        }
-        /* No match, pass global option */
-        if (!options && option && fb_mode_option)
-                options = kstrdup(fb_mode_option, GFP_KERNEL);
-        if (options && !strncmp(options, "off", 3))
-                retval = 1;
-
-        if (option)
-                *option = options;
-
-        return retval;
-}
-EXPORT_SYMBOL(fb_get_options);
-
-#ifndef MODULE
-/**
- *      video_setup - process command line options
- *      @options: string of options
- *
- *      Process command line options for frame buffer subsystem.
- *
- *      NOTE: This function is a __setup and __init function.
- *            It only stores the options.  Drivers have to call
- *            fb_get_options() as necessary.
- *
- *      Returns zero.
- *
- */
-static int __init video_setup(char *options)
-{
-        int i, global = 0;
-
-        if (!options || !*options)
-                global = 1;
-
-        if (!global && !strncmp(options, "ofonly", 6)) {
-                ofonly = 1;
-                global = 1;
-        }
-
-        if (!global && !strchr(options, ':')) {
-                fb_mode_option = options;
-                global = 1;
-        }
-
-        if (!global) {
-                for (i = 0; i < FB_MAX; i++) {
-                        if (video_options[i] == NULL) {
-                                video_options[i] = options;
-                                break;
-                        }
-
-                }
-        }
-
-        return 1;
-}
-__setup("video=", video_setup);
-#endif
-
 MODULE_LICENSE("GPL");