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

[linux-2.6-omap-h63xx.git] / kernel / printk.c

diff --git a/kernel/printk.c b/kernel/printk.c
index 051d27e36a6c997e95215b90bfd3f50bfa7c9c08..bd2cd062878d6fb1f4b40895ddee7dbe9f9468da 100644 (file)
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -732,7 +732,7 @@ int __init add_preferred_console(char *name, int idx, char *options)
        return 0;
 }
 
-int __init update_console_cmdline(char *name, int idx, char *name_new, int idx_new, char *options)
+int update_console_cmdline(char *name, int idx, char *name_new, int idx_new, char *options)
 {
        struct console_cmdline *c;
        int i;