Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt...

[pandora-kernel.git] / drivers / char / vt.c

diff --git a/drivers/char/vt.c b/drivers/char/vt.c
index 50faa1f..bd1d116 100644 (file)
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
@@ -821,7 +821,7 @@ static inline int resize_screen(struct vc_data *vc, int width, int height,
  *
  *     Resize a virtual console, clipping according to the actual constraints.
  *     If the caller passes a tty structure then update the termios winsize
- *     information and perform any neccessary signal handling.
+ *     information and perform any necessary signal handling.
  *
  *     Caller must hold the console semaphore. Takes the termios mutex and
  *     ctrl_lock of the tty IFF a tty is passed.
@@ -2119,8 +2119,6 @@ static int do_con_write(struct tty_struct *tty, const unsigned char *buf, int co
        uint8_t inverse;
        uint8_t width;
        u16 himask, charmask;
-       const unsigned char *orig_buf = NULL;
-       int orig_count;
 
        if (in_interrupt())
                return count;
@@ -2142,8 +2140,6 @@ static int do_con_write(struct tty_struct *tty, const unsigned char *buf, int co
            release_console_sem();
            return 0;
        }
-       orig_buf = buf;
-       orig_count = count;
 
        himask = vc->vc_hi_font_mask;
        charmask = himask ? 0x1ff : 0xff;