diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-30 01:23:58 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-30 01:23:58 -0800 |
| commit | e697789d64f8748cb219d7f5c413c512953802cc (patch) | |
| tree | 42b617795b188ad05a9398af4cb28f5321368ab5 | |
| parent | 38b7da09cfdb2202f08476d6fb22a47649a177ec (diff) | |
| parent | fb445ee5f9bfc7cbef9e397556170c608dc02955 (diff) | |
| download | linux-e697789d64f8748cb219d7f5c413c512953802cc.tar.bz2 | |
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.
| -rw-r--r-- | drivers/serial/suncore.c | 2 | ||||
| -rw-r--r-- | kernel/printk.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/suncore.c b/drivers/serial/suncore.c index 707c5b03bce9..a2d4a19550ab 100644 --- a/drivers/serial/suncore.c +++ b/drivers/serial/suncore.c @@ -52,7 +52,7 @@ void sunserial_unregister_minors(struct uart_driver *drv, int count) } 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) { int off; diff --git a/kernel/printk.c b/kernel/printk.c index a30fe33de395..89011bf8c106 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -817,7 +817,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; |