commit e697789d64f8748cb219d7f5c413c512953802cc · tjh.dev/kernel

tjh.dev / kernel

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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.

Linus Torvalds 18 years ago e697789d 38b7da09

+2 -2

2 changed files

expand all

unified split

drivers

serial

suncore.c

kernel

printk.c

+1 -1

drivers/serial/suncore.c

··· 52 52 } 53 53 EXPORT_SYMBOL(sunserial_unregister_minors); 54 54 55 - int __init sunserial_console_match(struct console *con, struct device_node *dp, 55 + int sunserial_console_match(struct console *con, struct device_node *dp, 56 56 struct uart_driver *drv, int line) 57 57 { 58 58 int off;

+1 -1

kernel/printk.c

··· 817 817 * commonly to provide a default console (ie from PROM variables) when 818 818 * the user has not supplied one. 819 819 */ 820 - int __init add_preferred_console(char *name, int idx, char *options) 820 + int add_preferred_console(char *name, int idx, char *options) 821 821 { 822 822 struct console_cmdline *c; 823 823 int i;