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

[karo-tx-linux.git] / drivers / char / hvsi.c

diff --git a/drivers/char/hvsi.c b/drivers/char/hvsi.c
index d4b14ff1c4c1b1b8a707cebd84c8626f5bd08520..1f4b6de65a2dcac06a565aa7777359e1e873b444 100644 (file)
--- a/drivers/char/hvsi.c
+++ b/drivers/char/hvsi.c
@@ -1255,7 +1255,7 @@ static int __init hvsi_console_setup(struct console *console, char *options)
        return 0;
 }
 
-static struct console hvsi_con_driver = {
+static struct console hvsi_console = {
        .name           = "hvsi",
        .write          = hvsi_console_print,
        .device         = hvsi_console_device,
@@ -1308,7 +1308,7 @@ static int __init hvsi_console_init(void)
        }
 
        if (hvsi_count)
-               register_console(&hvsi_con_driver);
+               register_console(&hvsi_console);
        return 0;
 }
 console_initcall(hvsi_console_init);