git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'tty-6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
[sfrench/cifs-2.6.git]
/
drivers
/
tty
/
serial
/
8250
/
8250_core.c
diff --git
a/drivers/tty/serial/8250/8250_core.c
b/drivers/tty/serial/8250/8250_core.c
index 74568292186fba2dd3adbb91c4ebba801d4b5389..ab63c308be0a2f288e9bca062e4d2a48e783bbe9 100644
(file)
--- a/
drivers/tty/serial/8250/8250_core.c
+++ b/
drivers/tty/serial/8250/8250_core.c
@@
-32,6
+32,7
@@
#include <linux/nmi.h>
#include <linux/mutex.h>
#include <linux/slab.h>
#include <linux/nmi.h>
#include <linux/mutex.h>
#include <linux/slab.h>
+#include <linux/string_helpers.h>
#include <linux/uaccess.h>
#include <linux/io.h>
#ifdef CONFIG_SPARC
#include <linux/uaccess.h>
#include <linux/io.h>
#ifdef CONFIG_SPARC
@@
-1175,8
+1176,8
@@
static int __init serial8250_init(void)
serial8250_isa_init_ports();
serial8250_isa_init_ports();
- pr_info("Serial: 8250/16550 driver, %d ports, IRQ sharing %s
abled
\n",
- nr_uarts, s
hare_irqs ? "en" : "dis"
);
+ pr_info("Serial: 8250/16550 driver, %d ports, IRQ sharing %s\n",
+ nr_uarts, s
tr_enabled_disabled(share_irqs)
);
#ifdef CONFIG_SPARC
ret = sunserial_register_minors(&serial8250_reg, UART_NR);
#ifdef CONFIG_SPARC
ret = sunserial_register_minors(&serial8250_reg, UART_NR);