diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-30 10:23:58 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-30 10:23:58 +0100 |
| commit | e697789d64f8748cb219d7f5c413c512953802cc (patch) | |
| tree | 42b617795b188ad05a9398af4cb28f5321368ab5 /drivers | |
| parent | [BLUETOOTH]: put_device before device_del fix (diff) | |
| parent | [SERIAL]: Fix section mismatches in Sun serial console drivers. (diff) | |
| download | linux-e697789d64f8748cb219d7f5c413c512953802cc.tar.xz linux-e697789d64f8748cb219d7f5c413c512953802cc.zip | |
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.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/serial/suncore.c | 2 |
1 files changed, 1 insertions, 1 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; |