|
@@ -556,34 +556,6 @@ static int do_fbcon_takeover(int show_logo)
|
|
|
return err;
|
|
|
}
|
|
|
|
|
|
-static int fbcon_takeover(int show_logo)
|
|
|
-{
|
|
|
- int err, i;
|
|
|
-
|
|
|
- if (!num_registered_fb)
|
|
|
- return -ENODEV;
|
|
|
-
|
|
|
- if (!show_logo)
|
|
|
- logo_shown = FBCON_LOGO_DONTSHOW;
|
|
|
-
|
|
|
- for (i = first_fb_vc; i <= last_fb_vc; i++)
|
|
|
- con2fb_map[i] = info_idx;
|
|
|
-
|
|
|
- err = take_over_console(&fb_con, first_fb_vc, last_fb_vc,
|
|
|
- fbcon_is_default);
|
|
|
-
|
|
|
- if (err) {
|
|
|
- for (i = first_fb_vc; i <= last_fb_vc; i++) {
|
|
|
- con2fb_map[i] = -1;
|
|
|
- }
|
|
|
- info_idx = -1;
|
|
|
- } else {
|
|
|
- fbcon_has_console_bind = 1;
|
|
|
- }
|
|
|
-
|
|
|
- return err;
|
|
|
-}
|
|
|
-
|
|
|
#ifdef MODULE
|
|
|
static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info,
|
|
|
int cols, int rows, int new_cols, int new_rows)
|