diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-30 10:23:58 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-30 10:23:58 +0100 |
| commit | e697789d64f8748cb219d7f5c413c512953802cc (patch) | |
| tree | 42b617795b188ad05a9398af4cb28f5321368ab5 /kernel | |
| parent | [BLUETOOTH]: put_device before device_del fix (diff) | |
| parent | [SERIAL]: Fix section mismatches in Sun serial console drivers. (diff) | |
| download | linux-e697789d64f8748cb219d7f5c413c512953802cc.tar.xz linux-e697789d64f8748cb219d7f5c413c512953802cc.zip | |
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 'kernel')
| -rw-r--r-- | kernel/printk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/printk.c b/kernel/printk.c index a30fe33de395..89011bf8c106 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -817,7 +817,7 @@ __setup("console=", console_setup); * commonly to provide a default console (ie from PROM variables) when * the user has not supplied one. */ -int __init add_preferred_console(char *name, int idx, char *options) +int add_preferred_console(char *name, int idx, char *options) { struct console_cmdline *c; int i; |