Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / char / hvc_console.c

diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c
index 35cca4c7fb186684aa41ef27228d85a932d97774..fa27d1676ee5e0405cc5497bec6c703ade6e10b2 100644 (file)
--- a/drivers/char/hvc_console.c
+++ b/drivers/char/hvc_console.c
@@ -194,7 +194,7 @@ static int __init hvc_console_setup(struct console *co, char *options)
        return 0;
 }
 
-static struct console hvc_con_driver = {
+static struct console hvc_console = {
        .name           = "hvc",
        .write          = hvc_console_print,
        .device         = hvc_console_device,
@@ -220,7 +220,7 @@ static struct console hvc_con_driver = {
  */
 static int __init hvc_console_init(void)
 {
-       register_console(&hvc_con_driver);
+       register_console(&hvc_console);
        return 0;
 }
 console_initcall(hvc_console_init);
@@ -276,8 +276,8 @@ int hvc_instantiate(uint32_t vtermno, int index, const struct hv_ops *ops)
         * now (setup won't fail at this point).  It's ok to just
         * call register again if previously .setup failed.
         */
-       if (index == hvc_con_driver.index)
-               register_console(&hvc_con_driver);
+       if (index == hvc_console.index)
+               register_console(&hvc_console);
 
        return 0;
 }
@@ -641,7 +641,7 @@ int hvc_poll(struct hvc_struct *hp)
                }
                for (i = 0; i < n; ++i) {
 #ifdef CONFIG_MAGIC_SYSRQ
-                       if (hp->index == hvc_con_driver.index) {
+                       if (hp->index == hvc_console.index) {
                                /* Handle the SysRq Hack */
                                /* XXX should support a sequence */
                                if (buf[i] == '\x0f') { /* ^O */
@@ -909,7 +909,7 @@ static void __exit hvc_exit(void)
                tty_unregister_driver(hvc_driver);
                /* return tty_struct instances allocated in hvc_init(). */
                put_tty_driver(hvc_driver);
-               unregister_console(&hvc_con_driver);
+               unregister_console(&hvc_console);
        }
 }
 module_exit(hvc_exit);