diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2005-11-15 21:40:43 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-11-15 22:05:07 -0500 |
commit | d3ed65832029dcaf5fe086670a2f2c25600b51e9 (patch) | |
tree | 00b3ea25477868607b0aa47d55b0854118f73fb2 /arch/ppc/xmon/start.c | |
parent | 94b212c29f685ca54b5689a8e89ac7671c43d651 (diff) |
[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/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) | |||
184 | sccc = base + (addr & ~PAGE_MASK); | 184 | sccc = base + (addr & ~PAGE_MASK); |
185 | sccd = sccc + 0x10; | 185 | sccd = sccc + 0x10; |
186 | 186 | ||
187 | } else { | 187 | } |
188 | #ifdef CONFIG_PPC_CHRP | ||
189 | else { | ||
188 | base = (volatile unsigned char *) isa_io_base; | 190 | base = (volatile unsigned char *) isa_io_base; |
189 | if (_machine == _MACH_chrp) | 191 | if (_machine == _MACH_chrp) |
190 | base = (volatile unsigned char *) | 192 | base = (volatile unsigned char *) |
@@ -200,6 +202,7 @@ xmon_map_scc(void) | |||
200 | RXRDY = 1; | 202 | RXRDY = 1; |
201 | DLAB = 0x80; | 203 | DLAB = 0x80; |
202 | } | 204 | } |
205 | #endif /* CONFIG_PPC_CHRP */ | ||
203 | #elif defined(CONFIG_GEMINI) | 206 | #elif defined(CONFIG_GEMINI) |
204 | /* should already be mapped by the kernel boot */ | 207 | /* should already be mapped by the kernel boot */ |
205 | sccc = (volatile unsigned char *) 0xffeffb0d; | 208 | sccc = (volatile unsigned char *) 0xffeffb0d; |