Commit 68ea0492 authored by Pete Zaitcev's avatar Pete Zaitcev Committed by David S. Miller

drivers/serial/sunzilog.c: Fix build of sparc32 probing code.

parent e929a3ac
...@@ -1145,11 +1145,11 @@ static struct zilog_layout * __init get_zs_sun4u(int chip) ...@@ -1145,11 +1145,11 @@ static struct zilog_layout * __init get_zs_sun4u(int chip)
static struct zilog_layout * __init get_zs_sun4cmd(int chip) static struct zilog_layout * __init get_zs_sun4cmd(int chip)
{ {
struct linux_prom_irqs irq_info[2]; struct linux_prom_irqs irq_info[2];
unsigned long mapped_addr; unsigned long mapped_addr = 0;
int zsnode, chipid, cpunode; int zsnode, chipid, cpunode, bbnode;
if (sparc_cpu_model == sun4d) { if (sparc_cpu_model == sun4d) {
int bbnode, walk, no; int walk, no;
zsnode = 0; zsnode = 0;
bbnode = 0; bbnode = 0;
...@@ -1242,7 +1242,7 @@ static struct zilog_layout * __init get_zs_sun4cmd(int chip) ...@@ -1242,7 +1242,7 @@ static struct zilog_layout * __init get_zs_sun4cmd(int chip)
} else if (zilog_irq != irq_info[0].pri) { } else if (zilog_irq != irq_info[0].pri) {
prom_printf("SunZilog: Inconsistent IRQ layout for Zilog %d.\n", prom_printf("SunZilog: Inconsistent IRQ layout for Zilog %d.\n",
chip); chip);
promt_halt(); prom_halt();
} }
break; break;
} }
...@@ -1283,7 +1283,7 @@ static struct zilog_layout * __init get_zs(int chip) ...@@ -1283,7 +1283,7 @@ static struct zilog_layout * __init get_zs(int chip)
zilog_irq = 12; zilog_irq = 12;
res.end = (res.start + (8 - 1)); res.end = (res.start + (8 - 1));
res.flags = IORESOURCE_IO; res.flags = IORESOURCE_IO;
return sbus_ioremap(&res, 0, 8, "SunZilog"); return (struct zilog_layout *) sbus_ioremap(&res, 0, 8, "SunZilog");
} }
return get_zs_sun4cmd(chip); return get_zs_sun4cmd(chip);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment