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

[sfrench/cifs-2.6.git] / arch / xtensa / platforms / iss / console.c

diff --git a/arch/xtensa/platforms/iss/console.c b/arch/xtensa/platforms/iss/console.c
index 464c2684c4f15fd04bd84760a3c14642a87373f6..92f567f9a21e0f7cd0af98c8052efb17ad5dbd6c 100644 (file)
--- a/arch/xtensa/platforms/iss/console.c
+++ b/arch/xtensa/platforms/iss/console.c
@@ -185,7 +185,7 @@ int __init rs_init(void)
 
        serial_driver = alloc_tty_driver(SERIAL_MAX_NUM_LINES);
 
-       printk ("%s %s\n", serial_name, serial_version);
+       pr_info("%s %s\n", serial_name, serial_version);
 
        /* Initialize the tty_driver structure */
 
@@ -214,7 +214,7 @@ static __exit void rs_exit(void)
        int error;
 
        if ((error = tty_unregister_driver(serial_driver)))
-               printk("ISS_SERIAL: failed to unregister serial driver (%d)\n",
+               pr_err("ISS_SERIAL: failed to unregister serial driver (%d)\n",
                       error);
        put_tty_driver(serial_driver);
        tty_port_destroy(&serial_port);