diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-16 07:58:48 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-16 07:58:48 -0800 |
| commit | d58a75ef75ad98f2d20ee6dccfc71f881aabffb0 (patch) | |
| tree | fbfa28526e3e2695c61d83a1a4997a8c3d00b686 /arch/ppc/xmon/start.c | |
| parent | f6ff56cd56b83d8edf4b3cffc5c53c56b37a5081 (diff) | |
| parent | 5d66da3d71e6aeca80ca08dbebd8a1cd72e6ee1f (diff) | |
| download | linux-d58a75ef75ad98f2d20ee6dccfc71f881aabffb0.tar.gz linux-d58a75ef75ad98f2d20ee6dccfc71f881aabffb0.tar.bz2 linux-d58a75ef75ad98f2d20ee6dccfc71f881aabffb0.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'arch/ppc/xmon/start.c')
| -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 98612d420346..c80177f8ec04 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; |