Skip to content

Commit

Permalink
[PATCH] ppc: Fix build with CONFIG_CHRP not set
Browse files Browse the repository at this point in the history
Building ARCH=ppc for multiplatforms with CONFIG_CHRP not set fails
due to some unshielded code in xmon

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Benjamin Herrenschmidt authored and Paul Mackerras committed Nov 16, 2005
1 parent 94b212c commit d3ed658
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion arch/ppc/xmon/start.c
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,9 @@ xmon_map_scc(void)
sccc = base + (addr & ~PAGE_MASK);
sccd = sccc + 0x10;

} else {
}
#ifdef CONFIG_PPC_CHRP
else {
base = (volatile unsigned char *) isa_io_base;
if (_machine == _MACH_chrp)
base = (volatile unsigned char *)
Expand All @@ -200,6 +202,7 @@ xmon_map_scc(void)
RXRDY = 1;
DLAB = 0x80;
}
#endif /* CONFIG_PPC_CHRP */
#elif defined(CONFIG_GEMINI)
/* should already be mapped by the kernel boot */
sccc = (volatile unsigned char *) 0xffeffb0d;
Expand Down

0 comments on commit d3ed658

Please sign in to comment.