1 files changed, 3 insertions, 7 deletions

diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c
index 54e32c513610..915fd74da7a2 100644
--- a/drivers/video/console/vgacon.c
+++ b/drivers/video/console/vgacon.c
@@ -47,7 +47,6 @@
 #include <linux/ioport.h>
 #include <linux/init.h>
 #include <linux/screen_info.h>
-#include <linux/smp_lock.h>
 #include <video/vga.h>
 #include <asm/io.h>
 
@@ -203,11 +202,7 @@ static void vgacon_scrollback_init(int pitch)
         }
 }
 
-/*
- * Called only duing init so call of alloc_bootmen is ok.
- * Marked __init_refok to silence modpost.
- */
-static void __init_refok vgacon_scrollback_startup(void)
+static void vgacon_scrollback_startup(void)
 {
         vgacon_scrollback = kcalloc(CONFIG_VGACON_SOFT_SCROLLBACK_SIZE, 1024, GFP_NOWAIT);
         vgacon_scrollback_init(vga_video_num_columns * 2);
@@ -376,7 +371,8 @@ static const char *vgacon_startup(void)
         u16 saved1, saved2;
         volatile u16 *p;
 
-        if (screen_info.orig_video_isVGA == VIDEO_TYPE_VLFB) {
+        if (screen_info.orig_video_isVGA == VIDEO_TYPE_VLFB ||
+            screen_info.orig_video_isVGA == VIDEO_TYPE_EFI) {
               no_vga:
 #ifdef CONFIG_DUMMY_CONSOLE
                 conswitchp = &dummy_con;