Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: [SERIAL]: Fix section mismatches in Sun serial console drivers.
This commit is contained in:
commit
e697789d64
|
@ -52,7 +52,7 @@ void sunserial_unregister_minors(struct uart_driver *drv, int count)
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(sunserial_unregister_minors);
|
EXPORT_SYMBOL(sunserial_unregister_minors);
|
||||||
|
|
||||||
int __init sunserial_console_match(struct console *con, struct device_node *dp,
|
int sunserial_console_match(struct console *con, struct device_node *dp,
|
||||||
struct uart_driver *drv, int line)
|
struct uart_driver *drv, int line)
|
||||||
{
|
{
|
||||||
int off;
|
int off;
|
||||||
|
|
|
@ -817,7 +817,7 @@ __setup("console=", console_setup);
|
||||||
* commonly to provide a default console (ie from PROM variables) when
|
* commonly to provide a default console (ie from PROM variables) when
|
||||||
* the user has not supplied one.
|
* 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;
|
struct console_cmdline *c;
|
||||||
int i;
|
int i;
|
||||||
|
|
Loading…
Reference in a new issue