Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

+2 -1
+2 -1
drivers/parisc/superio.c
··· 395 395 serial_port.iotype = UPIO_PORT; 396 396 serial_port.type = PORT_16550A; 397 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 401 /* serial port #1 */ 401 402 serial_port.iobase = sio_dev.sp1_base;