diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-30 04:23:58 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-30 04:23:58 -0500 |
| commit | e697789d64f8748cb219d7f5c413c512953802cc (patch) | |
| tree | 42b617795b188ad05a9398af4cb28f5321368ab5 /drivers | |
| parent | 38b7da09cfdb2202f08476d6fb22a47649a177ec (diff) | |
| parent | fb445ee5f9bfc7cbef9e397556170c608dc02955 (diff) | |
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) | |||
| 52 | } | 52 | } |
| 53 | EXPORT_SYMBOL(sunserial_unregister_minors); | 53 | EXPORT_SYMBOL(sunserial_unregister_minors); |
| 54 | 54 | ||
| 55 | int __init sunserial_console_match(struct console *con, struct device_node *dp, | 55 | int sunserial_console_match(struct console *con, struct device_node *dp, |
| 56 | struct uart_driver *drv, int line) | 56 | struct uart_driver *drv, int line) |
| 57 | { | 57 | { |
| 58 | int off; | 58 | int off; |