diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-02-25 17:39:16 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-02-25 17:39:16 +0100 |
| commit | 14ef2b0c026558d37662e5e095d59c64597d5769 (patch) | |
| tree | 230c09cc65bc94384c687fed87e6ada954f80609 /drivers/serial | |
| parent | 57ab12e418ec4fe24c11788bb1bbdabb29d05679 (diff) | |
| parent | 71b38bd4c1cc4f2b653064357e4efab77dfd711d (diff) | |
| download | kernel_samsung_smdk4412-14ef2b0c026558d37662e5e095d59c64597d5769.zip kernel_samsung_smdk4412-14ef2b0c026558d37662e5e095d59c64597d5769.tar.gz kernel_samsung_smdk4412-14ef2b0c026558d37662e5e095d59c64597d5769.tar.bz2 | |
Merge branches 'upstream', 'raw_report_modifications' and 'apple_magic_mouse' into for-linus
Conflicts:
drivers/hid/Kconfig
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/uartlite.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/uartlite.c b/drivers/serial/uartlite.c index 377f271..ab2ab3c 100644 --- a/drivers/serial/uartlite.c +++ b/drivers/serial/uartlite.c @@ -394,7 +394,7 @@ static void ulite_console_write(struct console *co, const char *s, spin_unlock_irqrestore(&port->lock, flags); } -static int __init ulite_console_setup(struct console *co, char *options) +static int __devinit ulite_console_setup(struct console *co, char *options) { struct uart_port *port; int baud = 9600; |