diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2005-11-16 13:40:43 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-16 14:05:07 +1100 |
| commit | d3ed65832029dcaf5fe086670a2f2c25600b51e9 (patch) | |
| tree | 00b3ea25477868607b0aa47d55b0854118f73fb2 /arch/ppc/xmon | |
| parent | 94b212c29f685ca54b5689a8e89ac7671c43d651 (diff) | |
| download | linux-3.10-d3ed65832029dcaf5fe086670a2f2c25600b51e9.tar.gz linux-3.10-d3ed65832029dcaf5fe086670a2f2c25600b51e9.tar.bz2 linux-3.10-d3ed65832029dcaf5fe086670a2f2c25600b51e9.zip | |
[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>
Diffstat (limited to 'arch/ppc/xmon')
| -rw-r--r-- | arch/ppc/xmon/start.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/ppc/xmon/start.c b/arch/ppc/xmon/start.c index 98612d42034..c80177f8ec0 100644 --- 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; |