diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-04 00:31:05 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-04 00:31:05 -0400 |
| commit | 075395d228641646159dae3dd170fa3fc6ff477a (patch) | |
| tree | 7cd5ace653d722549b23a2594140084c49bfcad6 /drivers/serial/mpc52xx_uart.c | |
| parent | 060ec6f2fb3c8abb85927758de8ac5d1018e6a43 (diff) | |
| parent | 61a116ef29e712147d7ee7a6738886e6f91df5f5 (diff) | |
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
Diffstat (limited to 'drivers/serial/mpc52xx_uart.c')
| -rw-r--r-- | drivers/serial/mpc52xx_uart.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c index 48eb22d3a63e..7708e5dd3656 100644 --- a/drivers/serial/mpc52xx_uart.c +++ b/drivers/serial/mpc52xx_uart.c | |||
| @@ -726,8 +726,7 @@ mpc52xx_uart_probe(struct platform_device *dev) | |||
| 726 | 726 | ||
| 727 | spin_lock_init(&port->lock); | 727 | spin_lock_init(&port->lock); |
| 728 | port->uartclk = __res.bi_ipbfreq / 2; /* Look at CTLR doc */ | 728 | port->uartclk = __res.bi_ipbfreq / 2; /* Look at CTLR doc */ |
| 729 | port->fifosize = 255; /* Should be 512 ! But it can't be */ | 729 | port->fifosize = 512; |
| 730 | /* stored in a unsigned char */ | ||
| 731 | port->iotype = UPIO_MEM; | 730 | port->iotype = UPIO_MEM; |
| 732 | port->flags = UPF_BOOT_AUTOCONF | | 731 | port->flags = UPF_BOOT_AUTOCONF | |
| 733 | ( uart_console(port) ? 0 : UPF_IOREMAP ); | 732 | ( uart_console(port) ? 0 : UPF_IOREMAP ); |