diff --git a/[refs] b/[refs] index 4b1a223f74b1..2b963dbeeef8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1a3f2ea336b784d7df750a7821f514f3dea69e29 +refs/heads/master: b6b1d87785712474d0ed80689c17107d616a1171 diff --git a/trunk/drivers/serial/8250.c b/trunk/drivers/serial/8250.c index 2f5a5ac1b271..301313002f6b 100644 --- a/trunk/drivers/serial/8250.c +++ b/trunk/drivers/serial/8250.c @@ -2514,7 +2514,7 @@ static int __init serial8250_console_setup(struct console *co, char *options) return uart_set_options(port, co, baud, parity, bits, flow); } -static int __init serial8250_console_early_setup(void) +static int serial8250_console_early_setup(void) { return serial8250_find_port_for_earlycon(); } diff --git a/trunk/drivers/serial/8250_early.c b/trunk/drivers/serial/8250_early.c index 150cad5c2eba..4d4c9f01be8d 100644 --- a/trunk/drivers/serial/8250_early.c +++ b/trunk/drivers/serial/8250_early.c @@ -227,7 +227,7 @@ int __init setup_early_serial8250_console(char *cmdline) return 0; } -int __init serial8250_find_port_for_earlycon(void) +int serial8250_find_port_for_earlycon(void) { struct early_serial8250_device *device = &early_device; struct uart_port *port = &device->port; diff --git a/trunk/kernel/printk.c b/trunk/kernel/printk.c index 051d27e36a6c..bd2cd062878d 100644 --- a/trunk/kernel/printk.c +++ b/trunk/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;