[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: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --git a/arch/ppc/xmon/start.c b/arch/ppc/xmon/start.c
index 98612d420346bde2e149e0368aadc84a82a82d40..c80177f8ec04e1f1fa6cc32fed12e90a6c3d26d9 100644 (file)
--- a/arch/ppc/xmon/start.c
+++ b/arch/ppc/xmon/start.c
@@ -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 *)
@@ -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;