diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-02 15:23:10 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-02 15:23:10 -0400 |
| commit | 80ec7ce7bf50f57d0c37c09c5ed95f7f88370da1 (patch) | |
| tree | b02eb734176bde952a5fa11ba788bee94846b46a | |
| parent | f9220c239f24e4d85a6a4f7eb9a8d9f251bd27ab (diff) | |
| parent | 3edfe0030bb7a82dab2a30a29ea6e1800e600c4b (diff) | |
Merge branch 'parisc-3.17-8' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc fix from Helge Deller:
"One late but trivial patch to fix the serial console on parisc
machines which got broken during the 3.17 release cycle"
* 'parisc-3.17-8' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: Fix serial console for machines with serial port on superio chip
| -rw-r--r-- | drivers/parisc/superio.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/parisc/superio.c b/drivers/parisc/superio.c index a042d065a0c7..8be2096c8423 100644 --- a/drivers/parisc/superio.c +++ b/drivers/parisc/superio.c | |||
| @@ -395,7 +395,8 @@ static void __init superio_serial_init(void) | |||
| 395 | serial_port.iotype = UPIO_PORT; | 395 | serial_port.iotype = UPIO_PORT; |
| 396 | serial_port.type = PORT_16550A; | 396 | serial_port.type = PORT_16550A; |
| 397 | serial_port.uartclk = 115200*16; | 397 | serial_port.uartclk = 115200*16; |
| 398 | serial_port.fifosize = 16; | 398 | serial_port.flags = UPF_FIXED_PORT | UPF_FIXED_TYPE | |
| 399 | UPF_BOOT_AUTOCONF; | ||
| 399 | 400 | ||
| 400 | /* serial port #1 */ | 401 | /* serial port #1 */ |
| 401 | serial_port.iobase = sio_dev.sp1_base; | 402 | serial_port.iobase = sio_dev.sp1_base; |