summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-04-08 17:43:39 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-08 17:43:39 -0700
commita219ee88b679c275863b882a0bb7b3330763e609 (patch)
treeb8ecab3d969eb3e56155f9ce2e323e73f63134f9 /drivers
parenta7b334de4d3651491ccd8c52c744af88d48785b9 (diff)
parent018ef96969098487ea3fdabd904d775a4cd93975 (diff)
downloadlinux-a219ee88b679c275863b882a0bb7b3330763e609.tar.bz2
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')
-rw-r--r--drivers/serial/sunsu.c2
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 = {
.major = TTY_MAJOR,
};
-static int __init sunsu_kbd_ms_init(struct uart_sunsu_port *up)
+static int __devinit sunsu_kbd_ms_init(struct uart_sunsu_port *up)
{
int quot, baud;
#ifdef CONFIG_SERIO