diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-08 20:43:39 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-08 20:43:39 -0400 |
| commit | a219ee88b679c275863b882a0bb7b3330763e609 (patch) | |
| tree | b8ecab3d969eb3e56155f9ce2e323e73f63134f9 /drivers/serial | |
| parent | a7b334de4d3651491ccd8c52c744af88d48785b9 (diff) | |
| parent | 018ef96969098487ea3fdabd904d775a4cd93975 (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:
sparc: Hook up sys_preadv and sys_pwritev
sparc64: add_node_ranges() must be __init
serial: sunsu: sunsu_kbd_ms_init needs to be __devinit
sparc: Fix section mismatch warnings in cs4231 sound driver.
sparc64: Fix section mismatch warnings in PCI controller drivers.
sparc64: Fix section mismatch warnings in power driver.
sparc64: get_cells() can't be marked __init
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/sunsu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c index a4dc79b1d7ab..47c6837850b1 100644 --- a/drivers/serial/sunsu.c +++ b/drivers/serial/sunsu.c | |||
| @@ -1178,7 +1178,7 @@ static struct uart_driver sunsu_reg = { | |||
| 1178 | .major = TTY_MAJOR, | 1178 | .major = TTY_MAJOR, |
| 1179 | }; | 1179 | }; |
| 1180 | 1180 | ||
| 1181 | static int __init sunsu_kbd_ms_init(struct uart_sunsu_port *up) | 1181 | static int __devinit sunsu_kbd_ms_init(struct uart_sunsu_port *up) |
| 1182 | { | 1182 | { |
| 1183 | int quot, baud; | 1183 | int quot, baud; |
| 1184 | #ifdef CONFIG_SERIO | 1184 | #ifdef CONFIG_SERIO |