summaryrefslogtreecommitdiffstats
path: root/arch/mips/philips/pnx8550/common/setup.c
diff options
context:
space:
mode:
authorVitaly Wool <vitalywool@gmail.com>2006-10-04 19:19:58 +0400
committerRalf Baechle <ralf@linux-mips.org>2006-10-04 18:06:15 +0100
commit7009af8cd37f7904939aec6bd2325c581abd7cac (patch)
treebcf4dcda14c662a4d0394c54f2f05731655e3256 /arch/mips/philips/pnx8550/common/setup.c
parent4a61f17378c2cdd9bd8f34ef8bd7422861d0c1f1 (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.c6
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 36b0c8bc6c0..e62123ca9b6 100644
--- a/arch/mips/philips/pnx8550/common/setup.c
+++ b/arch/mips/philips/pnx8550/common/setup.c
@@ -24,7 +24,7 @@
#include <linux/mm.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
-#include <linux/serial_ip3106.h>
+#include <linux/serial_pnx8xxx.h>
#include <linux/pm.h>
#include <asm/cpu.h>
@@ -56,7 +56,7 @@ extern char *prom_getcmdline(void);
struct resource standard_io_resources[] = {
{
- .start = .0x00,
+ .start = 0x00,
.end = 0x1f,
.name = "dma1",
.flags = IORESOURCE_BUSY
@@ -144,7 +144,7 @@ void __init plat_mem_setup(void)
/* We must initialize the UART (console) before prom_printf */
/* Set LCR to 8-bit and BAUD to 38400 (no 5) */
ip3106_lcr(UART_BASE, pnx8550_console_port) =
- IP3106_UART_LCR_8BIT;
+ PNX8XXX_UART_LCR_8BIT;
ip3106_baud(UART_BASE, pnx8550_console_port) = 5;
}