diff options
author | David S. Miller <davem@davemloft.net> | 2007-12-29 10:19:49 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2007-12-29 10:19:49 +0100 |
commit | fb445ee5f9bfc7cbef9e397556170c608dc02955 (patch) | |
tree | b1a478362ad1a147c4d2c06ef79f77225953ce99 /drivers/serial/suncore.c | |
parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/... (diff) | |
download | linux-fb445ee5f9bfc7cbef9e397556170c608dc02955.tar.xz linux-fb445ee5f9bfc7cbef9e397556170c608dc02955.zip |
[SERIAL]: Fix section mismatches in Sun serial console drivers.
We're exporting an __init function, oops :-)
The core issue here is that add_preferred_console() is marked
as __init, this makes it impossible to invoke this thing from
a driver probe routine which is what the Sparc serial drivers
need to do.
There is no harm in dropping the __init marker. This code will
actually work properly when invoked from a modular driver,
except that init will probably not pick up the console change
without some other support code.
Then we can drop the __init from sunserial_console_match()
and we're no longer exporting an __init function to modules.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/serial/suncore.c')
-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) } 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; |