Commit d3ed6583 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Paul Mackerras

[PATCH] ppc: Fix build with CONFIG_CHRP not set

Building ARCH=ppc for multiplatforms with CONFIG_CHRP not set fails
due to some unshielded code in xmon
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 94b212c2
...@@ -184,7 +184,9 @@ xmon_map_scc(void) ...@@ -184,7 +184,9 @@ xmon_map_scc(void)
sccc = base + (addr & ~PAGE_MASK); sccc = base + (addr & ~PAGE_MASK);
sccd = sccc + 0x10; sccd = sccc + 0x10;
} else { }
#ifdef CONFIG_PPC_CHRP
else {
base = (volatile unsigned char *) isa_io_base; base = (volatile unsigned char *) isa_io_base;
if (_machine == _MACH_chrp) if (_machine == _MACH_chrp)
base = (volatile unsigned char *) base = (volatile unsigned char *)
...@@ -200,6 +202,7 @@ xmon_map_scc(void) ...@@ -200,6 +202,7 @@ xmon_map_scc(void)
RXRDY = 1; RXRDY = 1;
DLAB = 0x80; DLAB = 0x80;
} }
#endif /* CONFIG_PPC_CHRP */
#elif defined(CONFIG_GEMINI) #elif defined(CONFIG_GEMINI)
/* should already be mapped by the kernel boot */ /* should already be mapped by the kernel boot */
sccc = (volatile unsigned char *) 0xffeffb0d; sccc = (volatile unsigned char *) 0xffeffb0d;
......
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