Merge tag 'trace-v4.4-rc4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[firefly-linux-kernel-4.4.55.git] / drivers / tty / ehv_bytechan.c

diff --git a/drivers/tty/ehv_bytechan.c b/drivers/tty/ehv_bytechan.c
index 3c60923b0957b446f82d271f11380ca58a718801..342b36b9ad35a1d4c77bbfa757d58c8ceaea0c14 100644 (file)
--- a/drivers/tty/ehv_bytechan.c
+++ b/drivers/tty/ehv_bytechan.c
@@ -112,7 +112,6 @@ static void disable_tx_interrupt(struct ehv_bc_data *bc)
 static int find_console_handle(void)
 {
        struct device_node *np = of_stdout;
-       const char *sprop = NULL;
        const uint32_t *iprop;
 
        /* We don't care what the aliased node is actually called.  We only