commit 80ec7ce7bf50f57d0c37c09c5ed95f7f88370da1
author Linus Torvalds <torvalds@linux-foundation.org> Thu Oct 02 12:23:10 2014 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Thu Oct 02 12:23:10 2014 -0700
tree b02eb734176bde952a5fa11ba788bee94846b46a
parent f9220c239f24e4d85a6a4f7eb9a8d9f251bd27ab
parent 3edfe0030bb7a82dab2a30a29ea6e1800e600c4b

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

drivers/parisc/superio.c

diff --git a/drivers/parisc/superio.c b/drivers/parisc/superio.c
index a042d06..8be2096 100644
--- a/drivers/parisc/superio.c
+++ b/drivers/parisc/superio.c
@@ -395,7 +395,8 @@
 	serial_port.iotype	= UPIO_PORT;
 	serial_port.type	= PORT_16550A;
 	serial_port.uartclk	= 115200*16;
-	serial_port.fifosize	= 16;
+	serial_port.flags	= UPF_FIXED_PORT | UPF_FIXED_TYPE |
+				  UPF_BOOT_AUTOCONF;
 
 	/* serial port #1 */
 	serial_port.iobase	= sio_dev.sp1_base;