Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial: [SERIAL] Ensure 8250_pci quirks are not marked __devinit [SERIAL] Convert fifosize to an unsigned int
This commit is contained in:
@@ -726,8 +726,7 @@ mpc52xx_uart_probe(struct platform_device *dev)
|
||||
|
||||
spin_lock_init(&port->lock);
|
||||
port->uartclk = __res.bi_ipbfreq / 2; /* Look at CTLR doc */
|
||||
port->fifosize = 255; /* Should be 512 ! But it can't be */
|
||||
/* stored in a unsigned char */
|
||||
port->fifosize = 512;
|
||||
port->iotype = UPIO_MEM;
|
||||
port->flags = UPF_BOOT_AUTOCONF |
|
||||
( uart_console(port) ? 0 : UPF_IOREMAP );
|
||||
|
Reference in New Issue
Block a user