diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-12 12:52:12 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-12 12:52:12 -0500 |
| commit | da8cadb31b82c9d41fc593c8deab6aa20b162d6b (patch) | |
| tree | 5640a34aa485f254de503a17833046645ade47f6 /drivers/serial/suncore.h | |
| parent | 02ec96be2b45d9f2712687ad107038ef390b24c2 (diff) | |
| parent | 0de56d1ab83323d604d95ca193dcbd28388dbabb (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Fix endless loop in cheetah_xcall_deliver().
[SERIAL] sparc: Infrastructure to fix section mismatch bugs.
Diffstat (limited to 'drivers/serial/suncore.h')
| -rw-r--r-- | drivers/serial/suncore.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/serial/suncore.h b/drivers/serial/suncore.h index 829d7d65d6..042668aa60 100644 --- a/drivers/serial/suncore.h +++ b/drivers/serial/suncore.h | |||
| @@ -22,7 +22,8 @@ | |||
| 22 | extern unsigned int suncore_mouse_baud_cflag_next(unsigned int, int *); | 22 | extern unsigned int suncore_mouse_baud_cflag_next(unsigned int, int *); |
| 23 | extern int suncore_mouse_baud_detection(unsigned char, int); | 23 | extern int suncore_mouse_baud_detection(unsigned char, int); |
| 24 | 24 | ||
| 25 | extern int sunserial_current_minor; | 25 | extern int sunserial_register_minors(struct uart_driver *, int); |
| 26 | extern void sunserial_unregister_minors(struct uart_driver *, int); | ||
| 26 | 27 | ||
| 27 | extern int sunserial_console_match(struct console *, struct device_node *, | 28 | extern int sunserial_console_match(struct console *, struct device_node *, |
| 28 | struct uart_driver *, int); | 29 | struct uart_driver *, int); |