From 75a191f37f9ee597c5d2ed03dfb3943768e0bf83 Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Wed, 16 Nov 2005 13:40:43 +1100
Subject: [PATCH] --- yaml --- r: 14271 b: refs/heads/master c:
 d3ed65832029dcaf5fe086670a2f2c25600b51e9 h: refs/heads/master i:   14269:
 f3caa2a4548948c1e032da6e979f91bea072f2d8   14267:
 459481613f9818c6c6ecf37040e9ee71df46303f   14263:
 e8dd657bc8e2796f23fe25114aa127fa97e2c59a   14255:
 9d077f1590e1d412cd210dc3574dfab02d63be4b   14239:
 701a88663e5de6dfd7a84d87da82a69c50c51f64   14207:
 66c348e474cbd0f73df185e37c19199eda224b22 v: v3

---
 [refs]                      | 2 +-
 trunk/arch/ppc/xmon/start.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 820cefc577e3..1b4c98d2745c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94b212c29f685ca54b5689a8e89ac7671c43d651
+refs/heads/master: d3ed65832029dcaf5fe086670a2f2c25600b51e9
diff --git a/trunk/arch/ppc/xmon/start.c b/trunk/arch/ppc/xmon/start.c
index 98612d420346..c80177f8ec04 100644
--- a/trunk/arch/ppc/xmon/start.c
+++ b/trunk/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;