Merge current mainline tree into linux-omap tree

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

diff --git a/kernel/printk.c b/kernel/printk.c
index 9c1fe0b3efff93646231a6904b9751fb6a955f51..f9904482d63d9990555e0750142606fc6f9a21a4 100644 (file)
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -839,7 +839,7 @@ __setup("console=", console_setup);
  * commonly to provide a default console (ie from PROM variables) when
  * the user has not supplied one.
  */
-int __init add_preferred_console(char *name, int idx, char *options)
+int add_preferred_console(char *name, int idx, char *options)
 {
        struct console_cmdline *c;
        int i;