Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80ec7ce7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents f9220c23 3edfe003

drivers/parisc/superio.c

+2 −1
Original line number Diff line number Diff line
@@ -395,7 +395,8 @@ static void __init superio_serial_init(void) 
	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;