diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-08 01:31:11 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-08 01:31:11 -0400 |
| commit | 334d0dd8b660557608142f0f77abc6812b48f08b (patch) | |
| tree | 9393a9aa099d7d42deda5f9f5054796c0c769be7 /drivers/serial/of_serial.c | |
| parent | 3f07d8796262f6aee135c8dd9a91210da9f888e4 (diff) | |
| parent | 5b94f675f57e4ff16c8fda09088d7480a84dcd91 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/serial/of_serial.c')
| -rw-r--r-- | drivers/serial/of_serial.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/serial/of_serial.c b/drivers/serial/of_serial.c index 09b0b736a751..336d0f4580d9 100644 --- a/drivers/serial/of_serial.c +++ b/drivers/serial/of_serial.c | |||
| @@ -48,7 +48,8 @@ static int __devinit of_platform_serial_setup(struct of_device *ofdev, | |||
| 48 | port->iotype = UPIO_MEM; | 48 | port->iotype = UPIO_MEM; |
| 49 | port->type = type; | 49 | port->type = type; |
| 50 | port->uartclk = *clk; | 50 | port->uartclk = *clk; |
| 51 | port->flags = UPF_SHARE_IRQ | UPF_BOOT_AUTOCONF | UPF_IOREMAP; | 51 | port->flags = UPF_SHARE_IRQ | UPF_BOOT_AUTOCONF | UPF_IOREMAP |
| 52 | | UPF_FIXED_PORT; | ||
| 52 | port->dev = &ofdev->dev; | 53 | port->dev = &ofdev->dev; |
| 53 | port->custom_divisor = *clk / (16 * (*spd)); | 54 | port->custom_divisor = *clk / (16 * (*spd)); |
| 54 | 55 | ||