summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-30 01:23:58 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-30 01:23:58 -0800
commite697789d64f8748cb219d7f5c413c512953802cc (patch)
tree42b617795b188ad05a9398af4cb28f5321368ab5 /drivers
parent38b7da09cfdb2202f08476d6fb22a47649a177ec (diff)
parentfb445ee5f9bfc7cbef9e397556170c608dc02955 (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.c2
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)
}
EXPORT_SYMBOL(sunserial_unregister_minors);
-int __init sunserial_console_match(struct console *con, struct device_node *dp,
+int sunserial_console_match(struct console *con, struct device_node *dp,
struct uart_driver *drv, int line)
{
int off;