Merge branch 'busybox' into merge

2 files changed, 4 insertions, 14 deletions

diff --git a/miscutils/Config.src b/miscutils/Config.src
index d69abf1a2..06f1c52ba 100644
--- a/miscutils/Config.src
+++ b/miscutils/Config.src
@@ -308,23 +308,13 @@ config LAST
         help
           'last' displays a list of the last users that logged into the system.
 
-choice
-        prompt "Choose last implementation"
-        depends on LAST
-        default FEATURE_LAST_FANCY
-
-config FEATURE_LAST_SMALL
-        bool "small"
-        help
-          This is a small version of last with just the basic set of
-          features.
-
 config FEATURE_LAST_FANCY
-        bool "huge"
+        bool "Turn on output of extra information"
+        default y
+        depends on LAST
         help
           'last' displays detailed information about the last users that
           logged into the system (mimics sysvinit last). +900 bytes.
-endchoice
 
 config HDPARM
         bool "hdparm"
diff --git a/miscutils/fbsplash.c b/miscutils/fbsplash.c
index 77033c258..9557c41db 100644
--- a/miscutils/fbsplash.c
+++ b/miscutils/fbsplash.c
@@ -150,7 +150,7 @@ static void fb_open(const char *strfb_device)
 
         // map the device in memory
         G.addr = mmap(NULL,
-                        G.scr_var.yres * G.scr_fix.line_length,
+                        (G.scr_var.yres_virtual ?: G.scr_var.yres) * G.scr_fix.line_length,
                         PROT_WRITE, MAP_SHARED, fbfd, 0);
         if (G.addr == MAP_FAILED)
                 bb_perror_msg_and_die("mmap");