diff options
author | Vitaly Wool <vitalywool@gmail.com> | 2006-10-04 11:19:58 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2006-10-04 13:06:15 -0400 |
commit | 7009af8cd37f7904939aec6bd2325c581abd7cac (patch) | |
tree | bcf4dcda14c662a4d0394c54f2f05731655e3256 /arch/mips/philips/pnx8550/common/setup.c | |
parent | 4a61f17378c2cdd9bd8f34ef8bd7422861d0c1f1 (diff) |
[MIPS] PNX8550 fixups
This patch fixes the compilation errors on PNX8550 and hard-to-track
bug in interrupt handling.
It also corresponds to the latest changes in PNX8550 serial driver.
Signed-off-by: Vitaly Wool <vitalywool@gmail.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/philips/pnx8550/common/setup.c')
-rw-r--r-- | arch/mips/philips/pnx8550/common/setup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/philips/pnx8550/common/setup.c b/arch/mips/philips/pnx8550/common/setup.c index 36b0c8bc6c06..e62123ca9b64 100644 --- a/arch/mips/philips/pnx8550/common/setup.c +++ b/arch/mips/philips/pnx8550/common/setup.c | |||
@@ -24,7 +24,7 @@ | |||
24 | #include <linux/mm.h> | 24 | #include <linux/mm.h> |
25 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
26 | #include <linux/interrupt.h> | 26 | #include <linux/interrupt.h> |
27 | #include <linux/serial_ip3106.h> | 27 | #include <linux/serial_pnx8xxx.h> |
28 | #include <linux/pm.h> | 28 | #include <linux/pm.h> |
29 | 29 | ||
30 | #include <asm/cpu.h> | 30 | #include <asm/cpu.h> |
@@ -56,7 +56,7 @@ extern char *prom_getcmdline(void); | |||
56 | 56 | ||
57 | struct resource standard_io_resources[] = { | 57 | struct resource standard_io_resources[] = { |
58 | { | 58 | { |
59 | .start = .0x00, | 59 | .start = 0x00, |
60 | .end = 0x1f, | 60 | .end = 0x1f, |
61 | .name = "dma1", | 61 | .name = "dma1", |
62 | .flags = IORESOURCE_BUSY | 62 | .flags = IORESOURCE_BUSY |
@@ -144,7 +144,7 @@ void __init plat_mem_setup(void) | |||
144 | /* We must initialize the UART (console) before prom_printf */ | 144 | /* We must initialize the UART (console) before prom_printf */ |
145 | /* Set LCR to 8-bit and BAUD to 38400 (no 5) */ | 145 | /* Set LCR to 8-bit and BAUD to 38400 (no 5) */ |
146 | ip3106_lcr(UART_BASE, pnx8550_console_port) = | 146 | ip3106_lcr(UART_BASE, pnx8550_console_port) = |
147 | IP3106_UART_LCR_8BIT; | 147 | PNX8XXX_UART_LCR_8BIT; |
148 | ip3106_baud(UART_BASE, pnx8550_console_port) = 5; | 148 | ip3106_baud(UART_BASE, pnx8550_console_port) = 5; |
149 | } | 149 | } |
150 | 150 | ||