diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-01-23 18:07:21 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-01-23 18:07:21 -0500 |
| commit | 9156ad48338e0306e508ead5c0d9986050744475 (patch) | |
| tree | 37f3a90e38190052ecf3cdf9171dfdddd37b56fd /drivers/serial | |
| parent | fa28237cfcc5827553044cbd6ee52e33692b0faa (diff) | |
| parent | 8f7b3d156d348b6766833cd4e272d0d19b501e64 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/serial')
| -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; |